test
konflikt behoben

Merge branch 'master' of https://github.com/hwiens/arena

Conflicts:
	file