Merge pull request #1 from emmelab2014/ignaciosiri

prueba a master
modifique readme
Merge branch 'master' of https://github.com/emmelab2014/proyecto
Propiedad a Atributo

Cambia clase Propiedad su nombre a "Atributo"
kinect ejemplo simple

es un simple ejemplo para inicializar la kinect
Merge pull request #2 from emmelab2014/ahorasellamaatributo

Propiedad a Atributo
sarasa

prueva
Revert "sarasa"

This reverts commit 3ee977fb1cb2eab0ecd2e46a7c4d2329e39e9812.
Revert "Revert "sarasa""

This reverts commit ed843cf388b42575bc1d16071056ce39164df98e.
Revert "Revert "Revert "sarasa"""

This reverts commit f6ddb4a62bcdb09fbd79826027ed11d7a934c1d0.
Esto NO VA!

Borro todooooo!
CAMBIO

cambio
Merge pull request #4 from emmelab2014/ignaciosiri

borre la Y
Revert "borre la Y"

This reverts commit c52674b0dc46a9e0bff37def7111450052158e49.
Merge pull request #3 from emmelab2014/Experimentadores

Experimentadores
asd

asd
assssss

aaasda
dasd

asdasd
Revert "dasd"

This reverts commit f679c6e5fcc4699c486041e00837bd5c708800bc.
asdadsasdasd

asdas