Changed js
Merge pull request #26 from anniezhn/azhang

Changed js