左框与右框之间的间距
Merge branch 'master' of https://github.com/phpblogs/blogs_php
本地configure
Merge branch 'master' of https://github.com/phpblogs/blogs_php

Conflicts:
	src/configure.php