print add by ubuntu
Merge branch 'master' of https://github.com/wangyaosuper/testgit

Conflicts:
	hello.c