begiing collsions
Merge sucessful
collide
pre merge
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin

Conflicts:
	js/GameEntity.js
	js/GameScreen.js