Konfloktlösung
Merge branch 'master' of https://github.com/kaizi99/SkatesCS-GS.git

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs