now to separate views, one for a user login via, and the other for logged in users
removed the comments because jack is gay
Merge branch 'master' into server-login