Otro comment
Conflicts solved with Tony comments
Merge branch 'master' of github.com:rbarrera87/githubparty