readme
Merge branch 'master' of github.com:maxime-tournier/pouf

Conflicts:
	README