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

Conflicts:
	KingNThings/src/com/model/Player.java