css tweak
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
tweak
solves merge conflict
Merge pull request #23 from ambertunnell/ben_2

Ben 2
Merge branch 'master' of github.com:ambertunnell/worldview
moved save listners in to thier respective doc.ready. FIXED Flickr location event listner
Merge branch 'master' of github.com:ambertunnell/worldview
added pic of ed to asset pipeline
Merge branch 'master' of github.com:ambertunnell/worldview
about etc
Merge branch 'master' of github.com:ambertunnell/worldview
Merge branch 'master' of github.com:ambertunnell/worldview
photo errors fixed and saving to dash
Merge branch 'master' of github.com:ambertunnell/worldview
Adds migration to add bigger_thing, lon, lat and country to city model
fixes photo glitch