fixed channel titles to update in the database
fixing up merge conflict
Merge branch 'master' of github.com:danchoi/geogossip