Merge branch 'master' into MoreyBranch2
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'