had to commit to leave this branch; don't use this version of this file
resolved city routes merge conflict
Merge branch 'develop' of https://github.com/PlantAlert/PlantAlert_backend into sinon-tests
add won't pull cities that have no users
changed deviceID to deviceToken
Merge pull request #26 from PlantAlert/device-token

Device token