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
wip fix css for description
fix merge conflicts
improved the rspec tests
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
worked on some specs
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
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge branch 'master' into Jess
Merge pull request #28 from JessicaTatham/Jess

Working on adventure display