"Make a basic User model (including secure passwords)"
"IDK"
Merge branch 'sign-up'

Conflicts:
	app/assets/stylesheets/custom.css.scss
add SSL in production
Finish sign in