first commit
Merge branch 'master' of github.com:schuma57/mariage

Conflicts:
	.gitignore