Actually set fight page
Merge branch 'master' of github.com:bdettmer/RockPaperMonsterHack

Conflicts:
	src/com/samsung/chord/samples/apidemo/MonsterFightActivity.java