Merge pull request #97 from jasonMatney/jason

added video
updated home html
fixed merge conflict
Merge pull request #98 from LasseSviland/master

fixed merge conflict
Trying to get third page to be responsive for instructor consultation
Fixed merge conflict that didn't exist
Fixing bug with added file in javascript
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
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