fixing conflicts in location.js #3
Fixed conflicts in location.js
Merge pull request #35 from jennielouie/working

trying to get my stash back