back to normal?
Merge branch 'master' of github.com:FranzPoize/5colordeathrow

Conflicts:
	src/levels/level1.js