:Merge branch 'master' of https://github.com/676f/goblog

Conflicts:
	render.go