ajout math
Merge branch 'master' of https://github.com/mathildeandre/web

Conflicts:
	CSS/nav.css
	CSS/styleAccueil.css