Intermediate commit
Finish user signup
Finish user signup
Finish user signup
Merge branch 'sign-up'

Conflicts:
	.idea/workspace.xml
	app/assets/stylesheets/custom.css.scss
	app/controllers/users_controller.rb
	app/helpers/users_helper.rb
	config/routes.rb
	spec/factories.rb
	spec/requests/user_pages_spec.rb
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is ahead of 'origin/master' by 5 commits.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   .idea/workspace.xml