preparing to sort out merge conflicts
the return of the login
just found out zoe was the problem
User.findById fixed
register works again
Merge branch 'master' of https://github.com/bchiatt/enlighTN into models
Merge pull request #36 from bchiatt/kayla

Kayla
added user update testing
Merge branch 'master' into models
Merge pull request #37 from bchiatt/models

Models
preparing to pull master
marge conflicts resolved
Merge pull request #38 from bchiatt/angular

Angular
map is showing up
user model error fixed
Merge pull request #39 from bchiatt/models

user model error fixed
Merge pull request #40 from bchiatt/angular

Angular
Merge pull request #41 from bchiatt/locations

Locations
Merge pull request #42 from bchiatt/locations

map is showing up
register