Merge pull request #18 from vlee90/vincent-branch

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