dragon span
Merge branch 'master' of https://github.com/CrSeth/WarOfInheritance_POO_TEC

Conflicts:
	build/classes/CapaLogica/Juego.class
	src/CapaLogica/Juego.java