Update hello.cpp
Merge branch 'master' of https://github.com/Zo0MER/helloworld

Conflicts:
	hello.cpp