Merge branch 'Greg-Sauce' into NEW-MASTER
Merge branch 'NEW-MASTER' of https://github.com/iamgregory/Battery-Code into NEW-MASTER