Act
actMerge branch 'master' of github.com:edr2394/Scrabble1.0

Conflicts:
	src/GUI/CargarImagenes.java
	src/GUI/Tablero.java
	src/GUI/Tablero.java~
	src/main.java
Act