stuff
Merge pull request #2 from achiu8/javascript

stuff