couche web & metier OK !
Merge branch 'master' of https://github.com/yjajkiew/projet-ei5

Conflicts:
	REST_server/metier.js
sync