Many changes
Merge branch 'master' of github.com:explodecomputer/gctaPower