Fixed power output calculations
Merge branch 'master' of https://github.com/FuzzyKittens/Group-Project