Merge branch 'master' of https://github.com/stormrain/Projets

Conflicts:
	bootstrap/css/custom.css
Correction css