Merge branch 'master' of https://github.com/gabi493/PROP
[ALEX] modified
[GABI] modified distancia + teclado
[ALEX] modificado
[GABI] modified distancia + teclado
Merge branch 'master' of https://github.com/alexon1234/PROP
Merge branch 'master' of https://github.com/gabi493/PROP