3rd commit
4th commit
Merge branch 'deadly_skills'
Merge branch 'master' of https://github.com/somcamfferman/dojo_rules