Merge branch 'master' into MoreyBranch2
Added a unique check for character names
Added a default enemy creator

Added a creator for a default difficult to defeat enemy for when no
enemy can be found at a level
updateGold added
Merge remote-tracking branch 'origin/master' into BillyDevBranch
Added gold update to db in battlestate

Added a call if updateGold in the battle state
Fixed some Blacksmith things and fixed getInventory
Merge remote-tracking branch 'origin/master' into BranDev-Branch
things and stuff
Merge remote-tracking branch 'origin/JohnDev-Branch'
Merge branch 'master' into MoreyBranch2
Just changed some of the template stuff for testing
CSS/HTML Changes Mostly for Battle State

Made CSS changes to the behavior of gridHalf to fix some problems with
battle state
Edited the path to normalize.css in Battle State printout so that it
will remove the top part
Fixed Inventory Table weirdness
Merge branch 'MoreyBranch2'
Merge remote-tracking branch 'origin/master' into JohnDev-Branch