wip fix css for description
fix merge conflicts
Added home page gif and fixed javascript to allow for reload with turbolinks
Deleted all unused images to make space
Merge pull request #22 from LasseSviland/master

Added csv files to store database
Fixed routes merge conflict
Merge pull request #23 from JessicaTatham/Jess

Added subway gif as home background and fixed broken javascript
initial homepage design
fix merge conflicts
fix home page css
remove excess css file
Working on adventure display
Merge pull request #27 from LasseSviland/master

updated seed file
Merge branch 'master' of https://github.com/cicadas-2014/Embark into Jess
Fixing merge conflict
Fixing merge for gemfile
Merge branch 'master' into Jess
Merge pull request #28 from JessicaTatham/Jess

Working on adventure display
update logo
Merge branch 'master' into design_home_page