definicion de entidades
Merge branch 'master' of https://github.com/fferz/thePencil4.git