Commit avant un merge
Merge branch 'master' of https://github.com/Eldaryze/LD31

Conflicts:
	game.js
Merge branch 'master' of https://github.com/Eldaryze/LD31
Merge branch 'master' of https://github.com/Eldaryze/LD31

Conflicts:
	game.js