Merge pull request #19 from Aulla/master

Para ponernos al dia (2)
Merge branch 'master' of https://github.com/klo-manolo/eneboo-features