new js
Merge pull request #3 from watersorceress/master

new js