commentaire inutile
Merge branch 'master' of https://github.com/Basmic/recettes

Conflicts:
	mojito.md