merge deadly_skills with master
Merge branch 'master' of https://github.com/andela-iarisah/dojo_rules
§