Commit Segundo
Tercer Commit
Cuarto Commit en Eclipse
Merge branch 'master' of https://github.com/cialarco/TallerGit.git

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