Merge pull request #11 from githubteacher/master

Githubteacher's contributions
Merge branch 'master' of github.com:cornelisonc/dojo_rules

* 'master' of github.com:cornelisonc/dojo_rules: