Class work of 3 and 10 November 2013
Merge remote-tracking branch 'origin/master'