Branched trunk to 1.x
Added Hello World Message
Brached
Merge branch '1.x'

Conflicts:
	hello-world.txt
Merge branch '2.x'