jugador con listas
Merge branch 'master' of github.com:edr2394/Scrabble1.0

Conflicts:
	src/ListasSimples/ListaSimple.java
Merge branch 'master' of github.com:edr2394/Scrabble1.0
cash
Merge branch 'master' of github.com:edr2394/Scrabble1.0
Atril

Conflicts:
	src/jugador/jugador.java