kwic-tests (noch fehler)
Merge branch 'master' of https://github.com/romibi/HSR_Prog3
Manual Merge Test.cpp

Conflicts:
	testate/testat_2/src/Test.cpp
	testate/testat_2/testat_2.xml