preparing to sort out merge conflicts
nav
Merge branch 'master' into kayla
unimportant change
Merge branch 'master' of https://github.com/bchiatt/enlighTN into kayla
users dbs added
Merge pull request #29 from bchiatt/db

users dbs added
fixed the nav
Merge branch 'master' into kayla
Merge pull request #30 from bchiatt/kayla

Kayla
added Reflections tests
Merge pull request #31 from bchiatt/models

added Reflections tests
location map centered on user
Merge branch 'master' of https://github.com/bchiatt/enlighTN
Event unit tests
Merge pull request #32 from bchiatt/models

Event unit tests
locations index page table is initialized, paging and filtering
Merge branch 'master' into kayla
Merge pull request #33 from bchiatt/kayla

Kayla
data-lat and lng