Menu bar moved in default.ctp
Git...

Git doesn't allow me to commit without these files :'(
Dunno why i have to commit these
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/ArenasController.php
	app/Model/Fighter.php
	app/View/Arenas/halloffame.ctp
	app/View/Arenas/index.ctp
Merge branch 'master' of https://github.com/VincentGagneux/WebArena

Conflicts:
	app/View/Arenas/halloffame.ctp

HALL OF FAME IS HELL !!!!!!!!!!!!
Merge branch 'master' of https://github.com/VincentGagneux/WebArena

Conflicts:
	app/View/Arenas/diary.ctp
:'(