Make a basic User model (including secure passwords)
Finish user signup
Finish sign in
:Merge branch 'master' of https://github.com/DevelopmentPractice201308/keijis11a

Conflicts:
	app/models/user.rb
	db/schema.rb
	spec/models/user_spec.rb
	spec/support/utilities.rb