Merge branch 'master' of https://github.com/MrHalfman/ld26

Conflicts:
	js/entities.js

Signed-off-by: Demurgos <demurgos@hotmail.fr>
Merge branch 'master' of https://github.com/MrHalfman/ld26