untrack generated files
Merge branch 'master' of github.com:keflavich/blog

Conflicts:
	output/categories.html
	output/tags.html