Merge pull request #2 from jvrunion/master

first push of a clone of energy