preparing for deploy
trying to deploy with gemfile update
conflicts fixed for heroku deploy
yoni's sixth changes
hi
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/assets/javascripts/map.js
	app/views/users/show.html.erb
Merge pull request #27 from ybinstock/master

yoni sixth changes
conflicts resolved