PLACEHOLEUR
Merge branch 'master' of github.com:Cgg/crazymailer

Conflicts:
	index.html