Finish user signup
Add SSL in production
Merge branch 'master' of github.com:ehansh/sample_app

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb