collison detection update
game objects
Merge branch 'master' of https://github.com/SnowblindFatal/tim

Conflicts:
	src/game/GameObject.cpp