experimenting with solar electric
Merge pull request #123 from extremezoo/Everett's-branch(5/29/14)

experimenting with solar electric
Merge pull request #124 from extremezoo/master

updating site