resolving conflicts
no changes
Merge branch 'master' of https://github.com/MPMoughan/zombielist
evening merge
404 added - in development.rb file, change config.consider_all_requests_local to false prior to deployment
Merge pull request #18 from bamiano/master

added 404