hello  lokal 2014-08-26 1
Main.java lokal auf testbranch
Merge branch 'master' of https://github.com/zawifan/Ppplppp

Conflicts:
	HelloGitWorld/src/HelloGitWorld.java
Merge branch 'testbranch'