Merge origin/master

Conflicts:
	src/JuegoJS/Carta.java
Merge origin/master

Conflicts:
	src/JuegoJS/Carta.java