Worked on Player, added Status enum, prelim item
Worked on Player, added Status enum, prelim item
Merge branch 'master' of github.com:/ninasun/PennApps2013

Conflicts:
	src/GameObject.java
	src/Item.java
	src/Player.java