Saving files
Merge branch 'master' of https://github.com/drain111/John-s-magical-adventure

Conflicts:
	Juego/src/screens/GameWorld.as