auth filter added to filters and auth checks uncommented in UsersController
fix merge conflict
Merge branch 'master' into Sharon
preparing for a pull
Merge branch 'master' into Sharon
working on security
Merge branch 'master' into Sharon
fixed formatting on login and still working on security
more formatting
added security comments to login page
Merge pull request #36 from blind-squirrel/barryn

Barryn
Merge pull request #37 from blind-squirrel/Sharon

Sharon
security for login complete
Merge pull request #38 from blind-squirrel/Sharon

security for login complete