Merge branch '83-implement-nfp-logic-for-cervix-mode' of gitlab.com:bloodyhealth/drip into 83-implement-nfp-logic-for-cervix-mode