Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess
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
Minor change to keep main image height consistent and auto-fit width
Working model rspec tests and 1 failing feature test
Merge pull request #26 from JessicaTatham/Jess

Jess
format map layout and home page styling
fixed merge conflicts in index.html.erb
styled home page and fixed top nav bar
Merge pull request #27 from jjow/country_images

Minor change to keep main image height consistent and auto-fit width
fixed merge conflict