added login to navbar
Merge branch 'dev' of https://github.com/JAT-English/JAT