- bugfix: freeze on rock falling on enemy
Merge branch 'master' into editor

Conflicts:
	src/levels.js
- new level