text lesen
Merge branch 'master' of https://github.com/shawnstein/HTWK

Conflicts:
	Uebung_3/main.c