Fixed conditional operator
Merge branch 'master' of https://github.com/TomHarling/BIO_11_2.git