Data.html now has daily, weekly, and hourly power readings, monthly still to do.
Resolved conflicts