Merge pull request #4 from jvrunion/master

first push of a clone of energy
Merge pull request #5 from jvrunion/pre-production

Merge pull request #4 from jvrunion/master