Added a shop for potions and added/modified monsters a bit - we can talk.
Merge branch 'master' of https://github.com/jcody28/warriordude into jcody28-master
Fixed c.json

Conflicts:
	c.json
	game.rb
one more fix
Merge branch 'jcody28-master'
Add a comment to update Jim's changes