Merge pull request #42 from anniezhn/master

Catchup with pushes
Added js
Close bracket
Merge pull request #43 from anniezhn/azhang

Azhang