merdes sur le poste
Merge branch 'master' of https://github.com/pr0z/MyAppointments-Node

Conflicts:
	app.js
	routes/users.js