finish
make a
Merge branch 'sign-up'

Conflicts:
	app/assets/stylesheets/custom.css.scss