eighth commit
Merge branch 'master' of github.com:qqyy/test

Conflicts:
	README