Revert "Finish user signup"
Merge pull request #24 from tabosque/revert-23-sign-up

Revert "Finish user signup"
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
	config/routes.rb
	spec/requests/user_pages_spec.rb
Merge pull request #36 from tabosque/develop

Develop
Copy develop files
Comment out group production
Merge pull request #38 from tabosque/master-local

Comment out group production