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

updated Events testing
Merge pull request #34 from bchiatt/locations

data-lat and lng
clear buttons on table, sorting by popularity and maybe distance
Merge branch 'master' into kayla
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
Merge pull request #38 from bchiatt/angular

Angular
user model error fixed
Merge pull request #39 from bchiatt/models

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

Angular
marge conflicts resolved