* .gitignore:
Merge branch 'gh-pages' of https://github.com/comatose/blog into gh-pages

Conflicts:
	.gitignore

* .gitignore: