Ajout de la maquette
Merge branch 'master' of https://github.com/samszo/EvalEtu

Conflicts:
	DIMI1314/Favoino_Lise/planning.html
Merge branch 'master' of https://github.com/samszo/EvalEtu