Backport changes from the tower of hanoi workshops#2

Open

pogliamarci wants to merge 2 commits intonecst:masterfrom

pogliamarci:changes-from-toh-workshop

Commits on Nov 13, 2016

Backport changes from the tower of hanoi workshops
pogliamarci
committed

Commits on Dec 9, 2016

Merge remote-tracking branch 'upstream/master' into changes-from-toh-workshop
pogliamarci
committed