renewal
Merge remote-tracking branch 'origin/old'

Conflicts:
	.gitignore
	about.md
	posts/2011-10-31-blog-created.md
	pub.md