Add init
Merge branch 'master' of github.com:funkyproject/fontaine.mx

Conflicts:
	.gitignore