changed max energy
timeout for meter camera
Merge branch 'master' of github.com:mattvenn/energy-wristband
Merge branch 'master' of github.com:mattvenn/energy-wristband
Merge branch 'master' of github.com:mattvenn/energy-wristband
set max energy
fixed merge