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
wip create tests for descrtiption view
Merge branch 'master' into create_test_for_description_view
Updated homepage css
Merge branch 'master' into jason
Merge pull request #37 from jasonMatney/jason

updated homepage css
make tests for description view
fix merge conflicts
Merge pull request #38 from DineshRai/create_test_for_description_view

Create test for description view
Added Javascript to recieve location of user and filter adventure options based on location
Fixed merge conflict for home view