Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2
some changes
chart changes
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2
stuff
added time on chart
Merge branch 'master' of https://github.com/PAUCHOU/surgeprotector into kevin2

merge conflict
Merge pull request #65 from PAUCHOU/kevin2

added chart time