commit from eclipse, resolve conflict on Main.java
Merge branch 'master' of https://github.com/zawifan/Ppplppp

Conflicts:
	HelloGitWorld/src/Main.java