Hummm
Merge branch 'NO-HEAD' of
https://github.com/Architecture-logicielle00/project.git into NO-HEAD

Conflicts:
	src/main/java/ca/ulaval/glo4003/projet_de_session/web/controllers/ControllerPrincipal.java