más conflicto
Merge branch 'master' of https://github.com/cdlopez/practicaGIT

Conflicts:
	GitAux.java