updated rebase skills
Merge branch 'deadly_skills' of https://github.com/schinkenpapst/dojo_rules into deadly_skills

Conflicts:
	introduction.md