initial commit
Merge branch 'master' of https://github.com/yoannmoinet/generator-maryeo

Conflicts:
	LICENSE