final commit
Merge branch 'master' of https://github.com/r-medina/tech_draft_team