misc
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

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