Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess
used nokogiri to scrape for country intros
Fixing merge view conflicts
Finally have good blurbs about each country for intro and a little bit of styling for country show page
Merge pull request #29 from JessicaTatham/Jess

Jess