moved functions around added some classes
moved functions around added some classes
moved functions around added some classes
moved functions around added some classes
moved functions around added some classes
moved functions around added some classes
Merge branch 'master' of https://github.com/jasonfleischer/KingsNThings

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