2nd JS commmit
Merge pull request #3 from michellegoldman/master

pull