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

Conflicts:
	src/game.js
Merge branch 'master' of https://github.com/FranzPoize/5colordeathrow
ouais yo