Added basic auth
Fixed merge
Merge branch 'master' of github.com:asharma93/hackathon-app
Finalised auth