Added method getBoundingBox to CollisionShape
Merge branch 'master' of https://github.com/iebaker/game-final-project

Conflicts:
	lib/NewLevel.nlf
Merge branch 'master' of https://github.com/iebaker/game-final-project