Added Collisons
Merge branch 'master' of https://github.com/lcb931023/mini_trooper

Conflicts:
	game/js/noMeansNo.js
fix conflict
shits