Merge branches

Fichero en Carpeta
Primer commit de mi rama
Eliminar Carpeta
Merge remote-tracking branch 'origin/Jesusito'
Eliminar
Update .gitignore
Commit inicial
Commit 2
Persona
Merge remote-tracking branch 'origin/Jesusito'
Merge branch 'master' of https://github.com/edumarcu/Academia
P2
Merge branches

Fichero en Carpeta
Eliminar Carpeta
Commit inicial
Commit 2
Asignatura beta v1
P2
Junit
Delete App