Commit propre
Merge branch 'master' of https://github.com/ienien/grimly

Conflicts:
	Makefile