add ny adventures
add ny adventures
Merge branch 'master' into add_ny_adventures
fix new york adventure seed
updated models and migrations
Merge pull request #63 from DineshRai/add_ny_adventures

Add ny adventures
Merge branch 'master' of https://github.com/cicadas-2014/Embark
updated models after pull request changed them
Fixed some alignment issues
Merge branch 'master' of https://github.com/cicadas-2014/Embark
CSS on adventures page
Fixed merge conflicts in CSS
Trying to integrate filter button into new header
Merge pull request #83 from JessicaTatham/master

Trying to integrate filter button into header
finised setting up new database
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #84 from LasseSviland/master

finised setting up new database
fix merge conflicts