Merge remote-tracking branch 'upstream/master'
Just gonna add my name to the contributers :)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/blackwolf12333/JAdventure
Merge pull request #35 from pthayer3/master

added items, added a value field to all items
fixed json errors, added public items
Sync with upstream
Change LocationManager to a normal class

Using an enum was a weird thing to do when you can just use a couple of static methods...:W
Update other classes to the changes in LocationManager
updated contributors in readme
can now pick up items
can now drop items and partially fixed saves; saving location/item changes in locations is broken, Ill fix it when I can
fixed saving so items are now fully working
Move code for printing the menu items to it's own function
Set the initial location of the player
Merge branch 'master' of https://github.com/blackwolf12333/JAdventure
Revert "Change LocationManager to a normal class"

This reverts commit 33b7772ee88e812d308fe9c1227c8c92ef7da224.
Revert "Update other classes to the changes in LocationManager"

This reverts commit 8208733c0984dc3b65255585435459319bf9a46f.
Add a simple help command
Merge branch 'master' of git://github.com/blackwolf12333/JAdventure into blackwolf12333-master

Conflicts:
	README.md