basic auth working
fix merge conflict
get rid of extra
Merge pull request #12 from rpandey1234/auth

Auth