Base
Merge pull request #1 from pedrocarpio/feature/base

Primer merge