Thirt commit
Merge branch 'master' of http://github.com/liangx8/test

Conflicts:
	README.md