Test to see whether I can push into the branch
Merge branch 'newgui' of https://github.com/Carmol/powercalc