unexplored hexes
Merge branch 'battle-test'

Conflicts:
	KingNThings/src/com/model/Cup.java
	KingNThings/src/com/model/Hex.java
	KingNThings/src/com/presenter/BoardPresenter.java
merge fixes
fixes wombat
Merge branch 'battle-test'
stuff
Partial merge.