Hello World from bloptestaccount2
Merge branch 'my-new-feature-2' of https://github.com/bloptestaccount2/demoproject

Conflicts:
	hello.js