wip fix css for description
fix merge conflicts
initial homepage design
fix merge conflicts
fix home page css
remove excess css file
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
Updated views for first page and adventure list
updated views to show city, and changed javascript for delte image to not conflict with adventures
Merge pull request #31 from LasseSviland/master

Updated photo urls for top 20 adventures, updated some views, fixed csv files, added filtering based on location.