updated JS to generate city urls
Merge branch 'master' of github.com:cpolitano/survival
commented out JS
resolved merge conflict
Merge branch 'mandym-webdev-javascript'