Merge branch 'killian'
Merge branch 'killian'
pull de master
Merge branch 'killian'
Merge branch 'killian'
Merge branch 'killian'
Merge branch 'killian'
modificado objeto multiplicacion
Merge branch 'killian'
conflicto resuelto
Ultimos cambios