Merge pull request #9 from walu/master

merge with walu
Merge pull request #10 from walu/master

merge with walu
add demon's blog
fix blank space and chine one bug
Merge pull request #41 from zxcvdavid/master

add demon's blog
Merge pull request #42 from wenjun1055/master

fix blank space and chine one bug
Merge pull request #11 from walu/master

merge with walu
alter weibo site
Merge branch 'master' of https://github.com/wenjun1055/phpbook

Conflicts:
	contributor.md
alter weibo site
fix rinit bugs.
fix author s info
Merge pull request #12 from walu/master

merge with walu
add blog url
make the code better
fix blank space bug
Merge pull request #43 from zxcvdavid/patch-1

make the code better
Merge pull request #44 from wenjun1055/master

fix some bug
Update preface.md

去掉ini setting 只显示中文
Merge pull request #46 from wpajqz/patch-1

Update preface.md