formatting change
Merge remote-tracking branch 'origin/master' into more-javascript
Merge pull request #19 from joshuamaxwell/more-javascript

More javascript