update
Merge branch 'master' of https://github.com/jsumrall/jsumrall.github.io

Conflicts:
	index.html
	stylesheets/pygment_trac.css