Merge pull request #15 from ybinstock/master

Yoni's second changes
update to rspec
Merge branch 'master' of https://github.com/MPMoughan/zombielist
yoni's third changes