Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/GamePanel.java
#	src/main/java/MenuPanel.java

.idea/hellsgamers.iml

@@ -6,8 +6,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

README.md

@@ -5,4 +5,3 @@ Pong Game developed by Eren Esen, Berkan Sarp, Justin Senn, Brice Tchoumi
 Pong game is a two-player table tennis-themed console game. The game involves two paddles and a moving ball. 
 The players have to move paddles in an upwards or downwards direction and save the ball from getting hit onto the wall. 
 If the ball hits the wall then it’s a score for another player. The game ends at 20 Points.
-

src/main/java/Ball.java

@@ -0,0 +1,2 @@
+public class Ball {
+}

src/main/java/GameFrame.java

@@ -0,0 +1,19 @@
+import javax.swing.*;
+import java.awt.*;
+
+public class GameFrame extends JFrame {
+    GamePanel panel;
+    GameFrame(){
+        panel = new GamePanel();
+        this.add(panel);
+        this.setTitle("2D Ping-Pong");
+        this.setResizable(false);
+        this.setBackground(new Color(31,78,47));
+        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        this.pack();
+        this.setVisible(true);
+        this.setLocationRelativeTo(null);
+
+    }
+
+}

src/main/java/Paddle.java

@@ -0,0 +1,2 @@
+public class Paddle {
+}

src/main/java/Score.java

@@ -0,0 +1,2 @@
+public class Score {
+}

src/main/java/build-project.sh

@@ -1 +1 @@
-#!/usr/bin/bash
+#!/bin/bash