eivind charging 2
Merge https://github.com/bernhardbreuss/DeltaSquad