updated hello
Merge branch 'master' of https://github.com/sjfawks/Test

Conflicts:
	src/hello.c