Merge pull request #109 from JessicaTatham/master

Added add Adventure feature to user home page, fully functional
fix merge conflicts
Merge pull request #110 from DineshRai/add_loading_gif

fix merge conflicts
Merge branch 'master' of https://github.com/cicadas-2014/Embark