JS and HTML Updates
Merge branch 'master' of https://github.com/tenji240/tenji240.github.io