no changes, but git said theres a diff
Merge branch 'master' of https://github.com/belcortes/worldcupapp
added checkboxes but duplicates exist
Merge branch 'master' of https://github.com/belcortes/worldcupapp
added image column to cities, added image urls, images displaying on cities/show pages