modif image
ajout odd automatiquement création de salle
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	manager/Utilisateur_Manager.js
maj odd
maj
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	public/map/37.png
	public/map/4_b.png
new css bootstrap
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct