Merge pull request #29 from vlee90/vincent-branch

Vincent branch
update JS
Merge branch 'master' of github.com:vlee90/final-project into vincent-branch