Resolved conflicts
Merge branch 'lambda' of ssh://git@github.com/jesper-bengtson/MirrorCharge.git into lambda
Preparing to merge to master.