commit
Merge branch 'master' of https://github.com/yxzblue/tp-blog

Conflicts:
	tp-blog/Conf/config.php