delte
Merge branch 'feng'

Conflicts:
	hello.c