add hello 6
Merge branch 'master' of github.com:vincent10e/practice

Conflicts:
	hello.c
merge ok