Tilf'jet classen Jens
Merge branch 'master' of https://github.com/KayJayOkay/XP-Atletik.git
trololo
Merge branch 'master' of https://github.com/KayJayOkay/XP-Atletik.git

Conflicts:
	XP Atletik/src/test/Test.java