rebase king
Merge branch 'new_rules' of github.com:jeffdoll-wf/dojo_rules into new_rules
fix some typos