Update from cron
Merge branch 'master' of github.com:badwolf9/Solarmax
Update from cron