Added JS, misc fixes
Merge branch 'master' of github.com:irrationl/cs146-uphone

I don't think anything actually conflicts, git pls