Working on making top20 countries have images
Merge pull request #32 from jasonMatney/jason

Jason
Fixing merge conflicts on seed, adventure view and controller
Merge branch 'master' of https://github.com/cicadas-2014/Embark
add css to third page
wip descriptions controller being constructed
fixed tests, and changed html for adventure list page
Merge pull request #33 from LasseSviland/master

fixed tests, and changed html for adventure list page
setup factory girl
Merge branch 'master' into set_up_factory_girl
fix descripiton test file
fix adventure params
Merge pull request #34 from DineshRai/set_up_factory_girl

Set up factory girl
Got rid of duplicate adventures and adventure pictures
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #35 from JessicaTatham/master

Changed CSV file on adventures to reduce repeats of adventures and images
made script to find duplicate adventures and images
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Removed duplicate adventures
Merge pull request #36 from LasseSviland/master

Removed duplicate adventures