Merge branch 'master' of https://github.com/ghislaindj/amecourt

Conflicts:
	public/css/style.css
Favicon