Task06
Task07
Merge branch 'master' of https://github.com/IsaacOlguin/Curso2014-2015
Revert "group 10"

This reverts commit a80eece7753677286f5eebe2281aa36faa3cebca.
Revert "Revert "group 10""

This reverts commit addc83ccff16fe0c382730ada351c95f9ca2f837.
added assignment4 sparql questionnaire
Merge remote-tracking branch 'upstream/master'
Revert "Assignment 3"

This reverts commit 9cd156f3d8e98c83e481b2cec5ab1b7e6bc219f0.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Grupo12
Basic info about our app
Add requirements
primera propuesta
Modified members.html
Merge pull request #1 from pdoro/master

Modified members.html ok!
Merge pull request #6 from sansr/master

Include optional requirement
Assignment2
cambios en aplication requirements, añadidos mock-ups
CSV Practica