Amélioration Controlleur
Merge branch 'master' of https://github.com/mathieulachance/TP4_MVC

Conflicts:
	LOG121_TP4/.idea/workspace.xml