prueba
delete prueba.txt

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

delelte
task 3 complete
Entrega Java
Merge pull request #115 from baraalex/master

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

entrega java