Class work of 30 March and 6 April
Merge remote-tracking branch 'origin/master'