prueba
delete prueba.txt

borrado
Merge commit '8abcbe5f7f459689ce54a2c52fa961bf4ad56be4'
hay un gay
Merge branch 'master' of https://github.com/AngelicaGuaman/Curso2014-2015
delete archivo

delelte
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
Add Rule for subClassOf
Merge pull request #114 from alejandrofcarrera/master

Add Rule for subClassOf
task 3 complete
Entrega Java
Merge pull request #115 from baraalex/master

Fixed task 3
Merge pull request #116 from AngelicaGuaman/master

entrega java
Merge remote-tracking branch 'upstream/master'