Make a basic User model (including secure passwords)
Finish user signup
Merge branch 'sign-up'

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
	app/views/users/new.html.erb
	config/environments/test.rb
	config/routes.rb
	spec/requests/user_pages_spec.rb
Add SSL in production