Merge branch 'master' of D:\Documents\Java Projekte\Hausaufgabe7 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of D:\Documents\Java Projekte\Hausaufgabe7 with conflicts.
Caesar weiterentwickelt