fixed merge conflict
Moved bower components
working on auth
basic auth working
otherwise route
working on auth
fixed errors
Merge pull request #34 from programng/authentication

Authentication