git rebase added
Merge branch 'master' of github.com:montgomerry/dojo_rules