title
Merge branch 'master' of https://github.com/mathieubrochard/mustache.git
test
Merge branch 'master' of https://github.com/mathieubrochard/mustache.git

Conflicts:
	mustache/src/mustache/Game.java
	mustache/src/mustache/Mustache.java