modifs
Merge branch 'master' of https://github.com/telenc/rush_ecole

Conflicts:
	menu_gauche.html