force ++
Merge branch 'master' of github.com:robinsonroy/WebArena

Conflicts:
	Model/Fighter.php