preparing to sort out merge conflicts
the return of the login
Merge pull request #38 from bchiatt/angular

Angular