add 2
Merge branch 'master' of https://github.com/baifang20/test

Conflicts:
	hello.c
change3