Various updates
Merge branch 'master' of github.com:MrHalfman/ld26
added fond du jeu version 1 (je continue à midi)
Merge branch 'master' of github.com:MrHalfman/ld26

Conflicts:
	js/entities.js
	js/game.js