Commit localmente
Merge remote-tracking branch 'origin/master'

Conflicts:
	tallerGit/src/tallerGit/Main.java