javascript and python
merge branch 'master' of https://github.com/ked83/CS4621