Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Adds additional cities and Beijing hardcode fix
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Adds omniauth, modifies tweet, user, photo, article relationships'
Merge pull request #5 from ambertunnell/ben_branch

Ben branch