Updated Nav

Fixed Login
Merge branch 'master' of https://github.com/AfterShockXD/offlinewebsite