OOO
Merge branch 'master' of github.com:fatalioerror/helloworld

Conflicts:
	src/hello.c

	修改：      src/hello.c