push tras pull de Alex
[ALEX] modified
[ALEX] modified
[ALEX] modified
Merge branch 'master' of https://github.com/alexon1234/PROP
b&b alex + Java-GUI
teoria cuatri
Merge branch 'master' of https://github.com/gabi493/PROP
untracked build mac casa
add build/
add especificacionClasesCompartidas.odt
modified MAC casa
pepus ordenador big shit