change hello string
Merge branch 'develop'

Conflicts:
	hello.c