pull master
Merge branch 'master' of github.com:robinsonroy/WebArena
Merge branch 'master' of github.com:robinsonroy/WebArena
pull
Merge branch 'master' of github.com:robinsonroy/WebArena
pull pour recup dex
Merge branch 'master' of github.com:robinsonroy/WebArena

Conflicts:
	Controller/ArenaController.php
	Model/Fighter.php
	View/Arena/sight.ctp