resolution conflit
Merge branch 'master' of https://github.com/Louis-AG/Technoweb
affichage des ennemis par ordre de distance croissante
Merge branch 'master' of https://github.com/Louis-AG/Technoweb

Conflicts:
	WebArenaGroupSI4-03-AG/app/Controller/PagesController.php