push tras pull de Alex
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
[pepus]
[pepus]x
modified MAC casa
pepus
pepus
[PEPUS] b/git shit
pepus
pepus ordenador big shit
Merge branch 'master' of https://github.com/alexon1234/PROP
[PEPUS]InterfazGrafica
[GABI] modified MAC casa
[PEPUS] .directory