Modified message

Looking to create a merge conflict with version pushed from emu-blade1
Merge remote-tracking branch 'origin/master'

Conflicts:
	hello/src/hello.c