1
Merge branch 'master' of https://github.com/mu2611/goblog

Conflicts:
	conf/app.conf
	goblog