performed a git reset --hard to revert to previois commit
Merge branch 'test' of https://github.com/TehNanor/beeroclock into test
fixed conflicts