Make a basic User model (including secure passwords)
Finish user signup
Add SSL in production
sign up exercises
Merge branch 'master' into sign-up
Finish sign in
Merge branch 'sign-in-out'

Conflicts:
	spec/requests/user_pages_spec.rb
"no idea what's going on commit"