inicial
Merge branch 'master' of github.com:eefret/hackitdo-chris