Make a basic User model (including secure passowrds)
Add SSL in production
Uncommited changes
Submitted css changes
Fixed bunch of version control mistakes
Merge branch 'sign-up'

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/helpers/users_helper.rb
	app/views/sessions/new.html.erb
	spec/requests/authentication_pages_spec.rb
	spec/requests/user_pages_spec.rb
Finish sign in