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
Merge pull request #30 from lalogf/master

Map css