Merge pull request #3 from mriclet/master

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

Conflicts:
	Makefile
Clean
Merge pull request #3 from ienien/master

Ok