oberer ball spwant richtig
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/client/Canvas.java
ball spawnt richtig