collision

Attempt to fix collision
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/GameScene.cpp