new js
Merge pull request #4 from cameronawebb/master

new js