PROBAMOS CONFLIGTO
Merge branch 'master' of https://github.com/rmarpozo/tallerGit.git

Conflicts:
	tallergit/src/main/java/es/ruben/chile/tallergit/Equipo3.java
Merge branch 'master' of https://github.com/rmarpozo/tallerGit.git
Merge branch 'master' of https://github.com/rmarpozo/tallerGit.git