probleme git
Merge branch 'master' of https://github.com/karlpralow/GLO-4003

Conflicts:
	src/main/java/ca/ulaval/glo4003/GLO_4003/web/controllers/HelloWorldController.java