Make a basic User model (including secure passwords)
Make a basic User model (including secure password)
Merge branch 'modeling_users'

Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	spec/helpers/application_helper_spec.rb
	spec/models/user_spec.rb
	spec/requests/static_pages_spec.rb
	spec/support/utilities.rb
Finish user signup
Add SSL in production
Changes with exercises from chapters 6,7
Finish sign in