EMERGENCY COMMIT, fix login
Merge branch 'master' of github.com:SoylentNews/slashcode