Made enemies collidable
Merge branch 'master' of https://github.com/glittershark/fabulosity

Conflicts:
	js/game.js
Merge branch 'master' of https://github.com/glittershark/fabulosity