Merge pull request #14 from bamiano/master

debugging and items model/table
add updated rspec for midday merge
Merge branch 'master' of https://github.com/MPMoughan/zombielist
resolving conflicts