Test
Release 1 kommentar
Merge branch 'Release1'

Conflicts:
	GitTest/src/test/horst/TestDisplay.java