Add email and password validation
Resolve branch issues
Solve branch issues
Resolve branch issues
Resolve branch issues
Merge branch 'sign-up'

Conflicts:
	app/assets/stylesheets/custom.css.scss
Finish user signup
Add SSL in production