Added the ability to load a file from disk.

This is arguably better than a sharp stick in the eye.
preparing to add in line highlights on mouseover
Line two gets highlighted!
JSLint
Merge remote-tracking branch 'origin/master' into code-demo-exp

Conflicts:
	js/app.js