yoni's first changes
Merge pull request #13 from ybinstock/master

yoni's first changes
added items table and debugged
removed conflicts
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
small changes to main view