Je sais pas ce que c'est...

enter the commit message for your changes. Lines starting
Test de mergage
Merge branch 'developpement' of github.com:IsepAppG2D-Info/SoundAndShow into developpement

Conflicts:
	core/Controller.php
	view/layout/default.php
	view/pages/view.php