.
Merge branch 'master' of https://github.com/wankes2000/dojo_rules