Jo

Signed-off-by: TheSniperFan <thesniperfan@gmail.com>
Auf aktuellen Branch gemergt
Merge branch 'testing' of https://github.com/knorko/Multimedior into testing

Conflicts:
	test.cpp