Class work of 29 Dec and 5 Jan 2014
Merge remote-tracking branch 'origin/master'