Merge branch 'master' of C:\Users\Administratör\Documents\TD-DodgeBall with conflicts.
Should be able to simulate