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

Conflicts:
	.gitignore

* drafts/stl-containers/Data/UnorderedMap.hs: