borrado y tests
.i
Merge branch 'master' of https://github.com/ProgApp2014/servidor

Conflicts:
	test.log