test3
Merge branch 'master' of https://github.com/nono-liang/test

Conflicts:
	README.txt
test5
test5&6