Merge branch 'master' into Surphy22
FEI CLASS
HermannClock Class hinzugefügt
WRONG FILE
HermmanClock Class import in main sketch
Merge pull request #2 from muthesius/bens-clock

Bens clock
Revert "WRONG FILE"

This reverts commit 407687398a3e58233659ab0704c3b83e1c08c5b7.
Revert "FEI CLASS"

This reverts commit ce32d8f5e2156684791e3f58a8502e4f7fce7c3a.
Fei
Merge branch 'master' into hermann-clock
Merge pull request #3 from muthesius/hermann-clock

Hermann clock
ShuyangLingClock
Merge pull request #6 from muthesius/Surphy22

Surphy22
Cleanup after merge

delete merge conflict markers + bogus file
lings clock fixed main sketch
Lings clock fixed main sketch
Merge branch 'master' into ShuyangLingClock

Resolved
Merge pull request #5 from muthesius/ShuyangLingClock

ShuyangLingClock Finally!!! :party:
Removed conflict markers
Better naming for lings clock