Merge branch 'master' of https://github.com/iamgregory/Battery-Code

Conflicts:
BMU_v7_6/BMU_v7_6.ino
Merge branch 'Nima-Ghods'
Merge branch 'master' of https://github.com/iamgregory/Battery-Code