Merge branch 'master' of https://github.com/metakazel/project4

Conflicts:
	project4.cbp
Merge branch 'master' of https://github.com/metakazel/project4