more inits
demo 2 initialzed
Merge branch 'master' into John-demo-setup

Conflicts:
	KingsNThings/src/com/kings/model/factory/GameStateFactory.java
Merge pull request #54 from devinlynch/John-demo-setup

John demo setup