Disparador rectangular visible
Merge remote-tracking branch 'origin/master'

Conflicts:
	AsaltoAlCastillo/src/main/Juego.java