bouh
Merge branch 'master' of https://github.com/MainMain/Ei4_Proj3ct

Conflicts:
	app.js
	manager/Utilisateur_Manager.js