flow corrections, added seed file and fixed items
Conflicts resolved
Merge pull request #22 from lalogf/master

flow corrections, added seed file and fixed items
Merge pull request #23 from ybinstock/master

yoni's fifth changes
modified CSS on home page and login page
Merge pull request #24 from bamiano/master

modified CSS on home page and login page
navbar created
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/assets/stylesheets/application.css
	app/views/access/home.html.erb
	app/views/access/login.html.erb
Merge pull request #25 from lalogf/master

navbar created
afternoon updates nov 24
navbar added with partials
conflicts resolved
conflicts resolved
Merge pull request #26 from lalogf/master

navbar added with partials
preparing for deploy
trying to deploy with gemfile update
conflicts fixed for heroku deploy
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/assets/javascripts/map.js
	app/views/users/show.html.erb