Finish energy page
Merge branch 'master' of https://github.com/prenderj/halton