conflicts
changes reverted
Merge branch 'master' of https://github.com/rheiny/helloWorld.git
merging change
Merge branch 'master' of https://github.com/rheiny/helloWorld.git

Conflicts:
	helloWorldProject/src/de/gerster/helloworld/HelloWorld.java