fixed
f
Merge branch 'master' of https://github.com/DanJP-/chris_and_dan_rule into s
Merge pull request #26 from DanJP-/s

S