2. Änderung der Test.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/test.cpp