some fixes
Merge branch 'final' of https://github.com/loljimmo12/Stijgmachine into final

Conflicts:
	src/stijgmachine/jti1a1/nl/controller/Main.java
	src/stijgmachine/jti1a1/nl/gameWelding/GameWeldingLogic.java
Fixes
Merge branch 'final' of https://github.com/loljimmo12/Stijgmachine into final
fixed things
final version
Merge branch 'SteamGame' of https://github.com/loljimmo12/Stijgmachine into final

Conflicts:
	src/gameSteamCreation/SteamGamePanel.java
	src/openingscreen/OpeningModel.java
	src/stijgmachine/jti1a1/nl/controller/Main.java