Merge remote-tracking branch 'origin/master' into joshua
added underscore and javascript
all done
Merge pull request #2 from joshuamaxwell/joshua

Joshua