Added Assignment 6. queries.sparql file
Add  assignment 4
Update of the analysis.html file

Only we've written some modifications of the data types and the correct column names
Deletion of the ontology file
Upload in the ontology dile
Deletion of the last json files
Update in the json files
Addition of the turtle files
Merge branch 'master' of https://github.com/IsaacOlguin/Curso2014-2015
analysis & ontology update
add json with links
added tll with links and correct form uris
Merge remote-tracking branch 'origin/master'

Conflicts:
	HandsOn/Grupo12/ontology/Ontology.owl
added files and renamed
Corrected assignment folder format
Delete queries.sparql
analisis actualizado nueva tabla
Merge https://github.com/alejandro2003/Curso2014-2015
Ontologia ampliada
Merge pull request #10 from SValverde/master

Ontologia