conf local
Merge remote-tracking branch 'origin/master'

Conflicts:
	TallerBasicoGit/src/cl/taller/git/Main.java