Changed hello
Merge branch 'master' of github.com:racorretjer/git-tut

Conflicts:
	hello.cpp