ahh!"
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
schema
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
schema
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
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
worked on second page
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
Merge pull request #93 from JessicaTatham/master

Added appending to addAdventure form and CSS, functionality isn't working yet.
js auth