Ajustes
Merge branch 'master' into Story-line-&-image-adjustment

Conflicts:
	Game/l1s1.py
Ajustes
DIALOGO!!!!!!
dialogo listo, fondo dialogo
Merge branch 'master' into Story-line-&-image-adjustment
Merge branch 'Story-line-&-image-adjustment'