solve conflict with 3 hellos
Merge branch 'master' of https://github.com/ayoubb/testGitHub.git

Conflicts:
	testGitHub/src/testGitHub/Main.java