Merge branch 'nouvelleArchi' of https://github.com/PauloSeb/Jarvisse-back into nouvelleArchi

Conflicts:
	server/app.js