Merge branch 'master' of https://gitlab.com/JonathanHager/ProtectTheMonster

core/src/com/trs/game/Controller.java

@@ -69,7 +69,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor {
 					model.timerStep();
 					if(model.isToReset()){
 						screen.dispose();
-						screen = new EndScreen(GAME_WORLD_WIDTH,GAME_WORLD_HEIGHT,model.getEnding(), volume);
+						screen = new EndScreen(GAME_WORLD_WIDTH,GAME_WORLD_HEIGHT, model.getEnding(), volume);
 					}
 				}
 			}

core/src/com/trs/game/view/Screens/EndScreen.java

@@ -23,7 +23,7 @@ public class EndScreen extends Screen {
             music = Gdx.audio.newMusic(Gdx.files.internal("lose.ogg"));
         }
         else{
-            music = Gdx.audio.newMusic(Gdx.files.internal("victory.mp3"));
+            music = Gdx.audio.newMusic(Gdx.files.internal("victory.ogg"));
         }
 
         music.setVolume(volume);