Am afisat un mesaj
Merge remote-tracking branch 'github/master'

Conflicts:
	src/HelloWorld/Main.java