jekyll-izing
Merge branch 'master' of https://github.com/stevenyoung/stevenyoung.github.io into gh-pages

Conflicts:
	index.html
Merge branch 'master' of https://github.com/stevenyoung/stevenyoung.github.io into gh-pages

Conflicts:
	index.html