what
Merge branch 'gh-pages' of https://github.com/gitlawr/gitlawr_blog into gh-pages

Conflicts:
	index.html
new index