Merge branch 'new_rules' of github.com:bymarkone/dojo_rules
Merge branch 'master' of github.com:bymarkone/dojo_rules