Add Travis Badge
Users can be removed from cities.
Merge pull request #17 from PlantAlert/delete-city

Users can be deleted from cities
fixed merge conflicts between develop and master