updated helloworld file
Merge branch 'master' of github.com:amelim/RIP-2013

Conflicts:
	cpp/scripts/helloWorld.cpp