Corrected README: content.js -> content.json.
Merge pull request #64 from colemanfoley/master

Corrected readme: content.js -> content.json.
Merge remote-tracking branch 'upstream/master' into gh-pages
Added Udacity course link "Introduction to Programming in Java" to Java
Merge pull request #71 from ziyiyang8/gh-pages

Updated content.json