add ability to CRUD cities
add cancan abilities for cities
Merge branch 'master' into cities

Getting ready to merge cities branch into master.
Making sure there are no conflicts.
clean up branch before merge
clean branch before merge
Merge pull request #4 from epicodus/cities

Cities