a
Merge branch 'master' of https://github.com/franaisa/Gloom

Conflicts:
	Exes/media/maps/blueprints.txt
Merge branch 'master' of https://github.com/franaisa/Gloom
Arreglada la red con los nuevos componentes. Features de la red de momento:
	-movimiento
	-salto normal
	-salto doble
Merge branch 'master' of https://github.com/franaisa/Gloom
retoque