modified login to direct users to a test main page, also some work on security
Merge branch 'master' of https://github.com/morganpatz/proj1