Merge branch 'master', remote-tracking branch 'origin'
move js in index.html to separate file