Formatierung
Formatierung der Einleitung
Merge branch 'master' of https://github.com/tfeldmann/QlockToo
Software und Firmware
Merge branch 'master' of https://github.com/tfeldmann/QlockToo

Conflicts:
	Documentation/Software.tex