yy
Merge branch 'master' of https://github.com/201213132/Practica1_201213132

Conflicts:
	bin/Jugar.class
	src/Jugar.java
Revert 95bd3f3..57380d1

This rolls back to commit 95bd3f33df65ec814f770076ef6cbf805233d6dd.
Revert "LoveLetter Final 2.2"

This reverts commit e2108a90b1cb9368be4d4dca5dfa7d04558c1364.
Revert "Revert "LoveLetter Final 2.2""

This reverts commit cffbc2966e269d6549b5dcdb2d21e8325196f422.