Ontology file
Merge commit '15e8444e5954ce645f5e2e82dbed493084ef1976'
Delete file ontology.xml
update ontology.rdf
Actualizando analysis
Merge branch 'master' of https://github.com/AngelicaGuaman/Curso2014-2015
Merge pull request #8 from christian92m5/master

Update of ontology file.
Merge commit 'f0efb08197b1bdc448d776e027faed8e23998758'
modificacion analysis.html
ultima
actualized analysis
Merge remote-tracking branch 'upstream/master'
actualizando analysis.html
Merge branch 'master' of https://github.com/AngelicaGuaman/Curso2014-2015

Conflicts:
	HandsOn/Group07/analysis.html
actualized analysis
actualizando analysis.html
actualized
analysis.html
Merge branch 'master' of https://github.com/AngelicaGuaman/Curso2014-2015 into AngelicaGuaman-master
Merge branch 'AngelicaGuaman-master'