Merge branches

Fichero en Carpeta
Eliminar Carpeta
Eliminar
Update .gitignore
Commit inicial
Commit 2
Asignatura beta v1
Merge remote-tracking branch 'origin/Jesusito'
Merge branch 'master' of https://github.com/edumarcu/Academia