tweak
Merge branch 'master' of https://github.com/ForestMist/nibbleblog

Conflicts:
	.gitignore