done task 6, not tested
Merge branch 'master' of https://Github.com/JamesGlanville/GF2