Merge pull request #6 from dschurholz/junior-dev

Junior dev
los modelos para las tablas
Merge branch 'master' into junior-dev