Merge branch 'master' of gitlab.stud.idi.ntnu.no:johain/netrunner

desktop/src/tdt4240/netrunner/DesktopLauncher.kt

@@ -10,7 +10,7 @@ object DesktopLauncher {
         val config = Lwjgl3ApplicationConfiguration()
         config.setForegroundFPS(60)
         config.setTitle("Netrunner")
-        config.setWindowIcon("logo_A.png")
+        config.setWindowIcon("icon.png")
         Lwjgl3Application(Netrunner(), config)
     }
 }