wip fix css for description
fix merge conflicts
initial homepage design
fix merge conflicts
fix home page css
remove excess css file
Working on adventure display
Merge branch 'master' of https://github.com/cicadas-2014/Embark into Jess
Fixing merge conflict
Fixing merge for gemfile
Merge branch 'master' into Jess
Merge pull request #28 from JessicaTatham/Jess

Working on adventure display
update logo
Merge branch 'master' into design_home_page
Merge pull request #29 from cicadas-2014/design_home_page

Design home page
Merge pull request #30 from JessicaTatham/Jess

working on making top20 countries have images
added filtering based on location
added updated csv files, and fixed seed file for top 20 adventures
updated image url for top 20 images to the actual url
changed the html for adventure list to have right url for redirect to adventure page