fixed merge conflicts
forgot to add home.js file
Merge pull request #33 from bobolinks-2014/trails-map

fixed merge conflicts