sarasa
Merge branch 'master' of https://github.com/pradoAgustin/adetp

Conflicts:
	build.xml
	out/production/adetp/backend/Board$1.class
	out/production/adetp/backend/Board$Difference.class
	out/production/adetp/backend/Board.class
	out/production/adetp/backend/Chronometer.class
	out/production/adetp/backend/Position.class
	out/production/adetp/testing/TestExact.class
	out/production/adetp/testing/testaprox.class

adf
Merge branch 'master' of https://github.com/pradoAgustin/adetp
solucionado bug en los algoritmos
Merge branch 'master' of https://github.com/pradoAgustin/adetp