Login startup
Merge branch 'master' of https://github.com/asharma93/hackathon-app

Merge
Fixing login
Merge branch 'master' of https://github.com/asharma93/hackathon-app

Merge
Navigation fixed