deleted some comments and reordered code
Merge branch 'master' of https://github.com/jinmel/csed232Project

Conflicts:
	src/client/scene/ingamescene.h