created CSV file of continental adventures
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #160 from LasseSviland/master

updated user page
Added seed for continental adventures and fixed naples geocode
Merge branch 'master' of https://github.com/cicadas-2014/Embark
added image to description page to replace the glyph
add compass image
Merge pull request #161 from JessicaTatham/master

Added seed for continental adventures and fixed naples geocode
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
compass.jpg
Merge pull request #163 from jasonMatney/jason

added compass gif
clip background movie
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #164 from jasonMatney/jason

clipped the movie
Fixed CSS for user home page and fixed favorites button so user homepage displays favorites, also fixed image display on descriptions page to center single image
Fixed merge conflict with centering single image
Merge pull request #165 from JessicaTatham/master

Fixed CSS for user home page and fixed favorites button so user homep…
fixed merge conflicts