Prueba
Merge origin/Abraham into Lenin

Conflicts:
	.gitignore
Para merge
metodos add
lista de fichas en bolsa
bolsa llena
MERGE
bolsa llena
Merge origin/Lenin into Abraham

Conflicts:
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/LOGIC/Ficha.java
Merge origin/Lenin into Abraham

Conflicts:
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/LOGIC/Ficha.java
Merge origin/Abraham into HEAD

Conflicts:
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/LOGIC/Ficha.java
Merge origin/Abraham into HEAD

Conflicts:
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/LOGIC/Ficha.java
Merge origin/Lenin into Abraham
Merge origin/Abraham into HEAD

Conflicts:
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/LOGIC/Ficha.java
Merge origin/Lenin into Abraham
Merge origin/Abraham into Lenin

Conflicts:
	src/scrabble/DATAIO/LeerTexto.java
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/main.java
Merge origin/Abraham into Lenin

Conflicts:
	src/scrabble/DATAIO/LeerTexto.java
	src/scrabble/LOGIC/Bolsa.java
	src/scrabble/main.java