my files
modify files
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/baraalex/Curso2014-2015
Revert "modify files"

This reverts commit e58bd14c424b3fb27092b16ee4ae2b36774ad530.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:baraalex/Curso2014-2015
upload task 3
Añado la task 6 aunque se que no funciona la tarea 6.6 Me da un error y no se como solucionarlo
Merge branch 'master' of https://github.com/FacultadInformatica-LinkedData/Curso2014-2015
Añado el task 7
Assignment 3 Solved
Merge pull request #107 from baraalex/master

Task 3
Merge pull request #108 from jchanam/master

Añadido el fichero 6
Merge pull request #109 from alejandrofcarrera/master

Assignment 3 Solved
Update with Inference
Include Task06_Sandra_Saez.java and Task07_Sandra_Saez.java
Merge pull request #112 from alejandrofcarrera/master

Update with Inference
Merge remote-tracking branch 'upstream/master'
Merge pull request #113 from sansr/master

Include Sandra_Saez files