added models, validations
conflict resolution
working routes/controllers/views/database population
Merge branch 'master' of https://github.com/MPMoughan/zombielist

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/show.html.erb
removed duplicate user.rb folder
Merge pull request #9 from bamiano/master

Wednesday Evening Work