Signed-off-by: Aleix <aleix.casanova@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Vista/CrearTestGrafica.java