830079b added highlight.js
Merge branch 'master' of https://github.com/ianrose/ianrose.github.io

Conflicts:
	atom.xml
	index.html
	styles/main.css