Css Etape 2 ...
Merge branch 'Css-Laurent'

Conflicts:
	index.html
	scripts/mainWhite.js