finished adding user signup
created sign in for users
Merge branch 'master' of https://github.com/antgonzales/sacruby

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/helpers/users_helper.rb
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/shared/_error_messages.html.erb
	config/routes.rb
	db/schema.rb
	spec/models/user_spec.rb
	spec/requests/user_pages_spec.rb
	spec/support/utilities.rb