Merge https://github.com/FacultadInformatica-LinkedData/Curso2014-2015
Assignment 5 and 6
Merge https://github.com/alejandro2003/Curso2014-2015
Ontologia ampliada
Merge pull request #10 from SValverde/master

Ontologia