Make a basic User model (including secure passwords)
Ch 7 git mistake
Merge branch 'sign-up'

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/controllers/users_controller.rb
	app/views/users/show.html.erb