changes
done
added some test templates, need to now get them to pass
deleted county_adventure_spec.rb
fetched from upstream
fixed some merge confilcts
improved the rspec tests
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
worked on some specs
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
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.
specs
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #32 from jasonMatney/jason

Jason
fixed tests, and changed html for adventure list page