Merge branch 'origin/master'
Changed javascript to new file.
Merge branch 'origin/gh-pages'