update
fixed rerouting off of the login page when a user is logged in
Merge branch 'tg'