commit local changes
merged maybe
premerge
Merge branch 'master' of https://github.com/samongoose/watttime
y axis labels looking good