Update qui fonctionne ...
modification sans importance
Merge remote-tracking branch 'origin/update'

Conflicts:
	mongoosepm/server/model/pass.js
	mongoosepm/server/routes/user.js
suppression des ajouts suite aux conflits
Merge remote-tracking branch 'origin/update'
Merge remote-tracking branch 'origin/update'