change last line,too
Merge branch 'master' of https://github.com/canghai118/test

Conflicts:
	hello.cus