add
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	README.md