stylings
added many to many relationship between users and items
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
minor changes
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
correct some css in maps
update to css file
Merge pull request #30 from lalogf/master

Map css
evening css changes nov 24
font update