fixed janky merge conflict
Merge branch 'master' of https://github.com/badascii/Dotameter