Energy bars and energybar class
 Merged magnus branch into master
 Fixed up the solution file
Merge branch 'master' of github.com:CiaranMcCann/Nina