Merge branch 'NEW-MASTER' into Greg-Sauce
python clean up
huh
Merge branch 'Greg-Sauce' into NEW-MASTER
Merge remote-tracking branch 'origin/Nima-Ghods' into NEW-MASTER
Merge branch 'NEW-MASTER' of https://github.com/iamgregory/Battery-Code into NEW-MASTER
Merge branch 'Nima-Ghods' into NEW-MASTER

Conflicts:
	python/.idea/workspace.xml
disregard mix, check voltage while relaxing, Uart
Merge remote-tracking branch 'origin/NEW-MASTER' into Nima-Ghods