Signed-off-by: josall01 <josall01@A18a1.alumnado.flo>
Merge remote-tracking branch 'origin/master'

Conflicts:
	AdRestaurant/src/Clases/Restaurante.java
Jose Miguel
Escalando las imagenes