Merge pull request #12 from DanJP-/g

G
Merge branch 'master' of https://github.com/DanJP-/chris_and_dan_rule into g