blah blah blah
Merge branch 'battle-test'

Conflicts:
	KingNThings/src/com/model/game/phase/GamePlay.java
	KingNThings/src/com/presenter/BattlePresenter.java