I added the energy conversion classes
Merge branch 'Energy2' into Test2