wip favoriting feature
fix merge conflicts
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 making an add Adventure feature for users and admin
adding new adventureCategories file
fixed merge conflicts
added csv with the cities and coords
importing of adventures/countries/cities/images is now wrking
Merge pull request #92 from LasseSviland/master

importing of adventures/countries/cities/images is now wrking
WIP adding addAdventure feature
Merge branch 'master' of https://github.com/cicadas-2014/Embark
WIP adding addAdventure feature
css