bug fixes dawn nov 24
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb