1.c
Merge branch 'master' of ssh://github.com/BenderIsGreat/kt_ws1314

Conflicts:
	06/aufgabe1.tex