changed map display to country name on hover, and changed country colors
Merge pull request #23 from JessicaTatham/Jess

Fixed search bar so user is now able to search for russia, united States...
add country name to mouseover on map
fix merge conflicts
Merge pull request #24 from davek09/master

map formatting
Add flickr API, seed images in db, add thumbnail click functionality
Fix merge conflicts
Fix merge conflict in Gemfile. Keep flickr and countries gem
Merge pull request #25 from jjow/country_images

Country images
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess
used nokogiri to scrape for country intros