Elektronik
Merge branch 'master' of https://github.com/tfeldmann/QlockToo

Conflicts:
	Documentation/Elektronik.tex