print hello world
Merge remote-tracking branch 'origin/hello' into hello

Conflicts:
	hello.cpp