create favorite meeting
Merge pull request #134 from LasseSviland/master

Updated css for login
Grabbing new working code
Merge branch 'master' into add_favoriting_feature
remove extra js file
Fixed merge conflicts on adventure page
Merge pull request #135 from DineshRai/add_favoriting_feature

Add favoriting feature
Fixed inspire me feature
Fixed merging conflicts on embark controller
Having updated user page and working on hover for inpsire me feature
Merge pull request #136 from JessicaTatham/master

Reimplementing inspire me feature
Merge branch 'master' of https://github.com/cicadas-2014/Embark
new york data
Merge branch 'master' into add_category_filter
Merge pull request #137 from DineshRai/add_category_filter

Add ny adventures
Working javascript to allow inspire me button to popup
Merge branch 'master' of https://github.com/cicadas-2014/Embark
fixed merge conflicts
Merge pull request #138 from JessicaTatham/master

	Working javascript to allow inspire me button to popup
Merge branch 'master' of https://github.com/cicadas-2014/Embark