create google map on description page
fix merge conflicts
Merge pull request #99 from JessicaTatham/master

Deleted funky file that messed with everything
deleted files
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Updated seed to save city to adventure
wip google map add
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #100 from LasseSviland/master

Updated seed to save city to adventure
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
fixed links
Merge pull request #101 from jasonMatney/jason

fixed those links
updated seed file to have right image url
add google map to description page
fixed div height that was blocking a link
Merge pull request #102 from LasseSviland/master

updated seed file to have right image url
Merge pull request #103 from DineshRai/add_google_map

Add google map
Merge pull request #104 from jasonMatney/jason

fixed div height that was blocking a link
Merge branch 'master' of https://github.com/cicadas-2014/Embark