Trollo added to hello world :abcd:
conflit test

merge on helloworld.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	helloWorld.js