Merge branch 'dev' of https://gitlab.stud.idi.ntnu.no/tobiasio/progark-gruppe-3 into dev

frontend/core/src/com/gameware/game/states/PlayStateTemplate.java

@@ -14,7 +14,7 @@ public abstract class PlayStateTemplate extends State {
     private Round round = null;
     private Tournament tournament = null;
     private Round nextRound = null;
-    protected float totalGameTime = 5f;
+    protected float totalGameTime = 30f;
 
     public PlayStateTemplate(GameStateManager gsm){
         super(gsm);