fixed bug with enemies1 collision
Merge branch 'master' of https://github.com/amurat/ggj2014

Conflicts:
	src/game.js