lots of stuff
Merge branch 'master' of https://github.com/FranzPoize/5colordeathrow

Conflicts:
	src/collision.js
	src/enemy_type.js