Test y correcciones presentación
Merge branch 'master' of https://github.com/A-Teo/XP

Conflicts:
	.classpath
	bin/.gitignore