finished login/signum buttons
Merge branch 'master' of https://github.com/cicadas-2014/Embark
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
Merge pull request #139 from LasseSviland/master

finished login/signup buttons
css n gif
img
Merge pull request #141 from jasonMatney/jason

img css gif
fixed login
Merge pull request #142 from LasseSviland/master

fixed login
place category on page
Merge branch 'master' into add_category_filter