Revert "test energies"

This reverts commit 590576148cd887f1f7be421752389b9322a24f49.
Merge branch 'master' of https://github.com/Avikash-Mishra/PixelJam2014
test
Merge branch 'master' of https://github.com/Avikash-Mishra/PixelJam2014