Blog update at 2014-09-04 01:06:56
Blog update at 2014-09-04 01:08:11
Merge branch 'gh-pages' of github.com:n-johnson/blog into gh-pages

Conflicts:
	index.html
Blog update at 2014-09-04 01:11:35