add ability for logged_in users to edit themselves
have cities destroy related events when deleted
remove add city button for unauthorized users
power outages caused merge conflicts to fail. Hopefully this fixes it.
fixed failing cities tests
merging?
Merge branch 'master' of https://github.com/epicodus/chicktech

make sure master is up to date
Merge branch 'master' of https://github.com/epicodus/chicktech

Resolving more merge conflicts. There were three open branches so making sure they all play nice together.