preparing for deploy
trying to deploy with gemfile update
conflicts fixed for heroku deploy
yoni's sixth changes
stylings
hi
added many to many relationship between users and items
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
ENV figaro setup for deployment
ENV figaro setup for deployment
added relationship between users and items
conflicts resolved
updated for deployment
Merge pull request #28 from bamiano/master

added relationship between items and users
update items table and controller
precomplied ruby for deployment
items modifications
Merge pull request #29 from bamiano/master

items modifications
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/favorites_controller.rb
	app/views/items/index.html.erb