commit1-2 20130405
Merge branch 'master' of https://github.com/jumroen/hello-world

Conflicts:
	helloworld.txt