añadido pakete juan
Merge origin/master

Conflicts:
	src/Ghiz/Baraja.java