Merge remote-tracking branch 'origin/master'
	Chapter 7: Classes