test1
Merge branch 'master' of
https://github.com/Maradonna90/SkispringenSim.git

Conflicts:
	Skispringen Simulator/src/Startup/Startup.java