wrote Location.all test
Merge pull request #22 from bchiatt/angular

updated package.json for coveralls
user login and register
merge conflict resolved
Merge pull request #23 from bchiatt/angular

coveralls should work now
Merge pull request #24 from bchiatt/user

User
Merge pull request #25 from bchiatt/models

wrote Location.all test
i am pushing something
factories
fixed merge conflict
Merge pull request #26 from bchiatt/user

factories
Merge branch 'master' into kayla
Merge pull request #27 from bchiatt/kayla

Kayla
map displays on location page