removed redundant security checks
Merge branch 'master' into testing
merged conflict
logic for two ways to login
Merge branch 'master' of github.com:bpraggastis/p-patch-Beige

Conflicts:
	app/controllers/users_controller.rb
sign in information
created sign in choices
merged Bri's frontpage changes
working on login
Merge pull request #5 from bpraggastis/login

Login