nothing
Merge branch 'master' into biggs
Merge branch 'master' into biggs
redirect to login instead
Merge branch 'master' into biggs
stuff
kill and penalize?
Merge branch 'master' into biggs
got rid of log