ignore
Merge branch 'dan' of https://github.com/TehNanor/beeroclock into dan
js fix