updated controller
Add sign in form
fixed failing tests
updated Gemfile
Merge branch 'master' of github.com:shawnacscott/pcs_capstone

Conflicts:
	config/routes.rb