Phase 2 of item changes done. We should be capturing most of the weapon/armor data from the charts in the book now.
Merge branch 'master' of heroku.com:hackmastertrack

OK, I did a pull, and got nothing, so I quickly added my files and committed and tried to push and it failed.  So I got this message when I pulled again, 20 seconds after I did the first pull.