Changing the location to resolve javascript/main.js so it works in subpaths of a domain.
Merge remote-tracking branch 'origin/gh-pages'