Git config
Merge branch 'master' of https://github.com/Fractaliste/photoMariage

Conflicts:
	web/.htaccess