gfagewfvw
Merge branch 'master' of https://github.com/charlesfarmer/hypermedia.git

Conflicts:
	web lab 6 -
back-end/src/ca/qc/collegeahuntsic/weblab6/service/interfaces/IFavoriService.java
	web lab 6 -
back-end/src/ca/qc/collegeahuntsic/weblab6/service/interfaces/IMarchandService.java