open-sourced
Merge branch 'master' of github.com:MaximeGir/marry_me_webapp

Conflicts:
	.gitignore