wip favoriting feature
fix merge conflicts
Merge pull request #89 from JessicaTatham/master

Aligned basic CSS for second page, handing it off to Jason
updated model tests
Merge branch 'master' of https://github.com/cicadas-2014/Embark
fixed some tests, removed test for old page
Merge pull request #90 from LasseSviland/master

updated model tests
wip add feature to allow user to favorite adventures
fix merge conflicts
wip favorting feature
Merge pull request #91 from DineshRai/add_favoriting_feature

Add favoriting feature
WIP adding addAdventure feature