Intentando arreglar los errores
Merge branch 'master' of https://github.com/FacultadInformatica-LinkedData/Curso2014-2015
Merge pull request #81 from jchanam/master

Arreglo fallos