merge
Merge branch 'HEAD' of https://github.com/maitegm/Tarea1Algoritmos.git

Conflicts:
	src/rtree/TestRTree.java
	tree.html
Inserción & búsqueda OK