complex
Merge branch 'feng'

Conflicts:
	hello.c
加入注释
为了看的清楚，多提交一次
Merge branch 'feng'
a
Merge branch 'master' into feng

Conflicts:
	hello.c