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
specs
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #32 from jasonMatney/jason

Jason
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