Update 2
Merge branch 'master' of github.com:pablosjv/practica2

Conflicts:
	src/PruebasGestorTabla.java