lol
lol
lol
merdei
Merge branch 'deadly_skills'

Conflicts:
	introduction.md
Merge branch 'master' of github.com:payou/dojo_rules