yoni's fourth changes
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb
Merge pull request #21 from ybinstock/master

yoni's fourth changes
Merge pull request #22 from lalogf/master

flow corrections, added seed file and fixed items
yoni's fifth changes
Merge pull request #23 from ybinstock/master

yoni's fifth changes
navbar created