Merge conflict fix

README.md

@@ -1,29 +1,28 @@
-# SnakePlusPlus
-A version of Snake made in C++ and using SFML
-
-## Controls
-  - Use the arrow keys to move the Snake
-  - Use the escape key to close the game
-
-## Compiling the game
-
-Prerequisites
-  - C++11
-  - [SFML](https://github.com/SFML/SFML)
-
-Clone the repository and compile it using:
-
-    git clone https://github.com/TriantaTV/snakeplusplus.git
-
-In order to compile the project, simply run these two commands:
-
-    cmake -B build -S .
-    cmake --build build
-
-## Running the Project
-The program should now be compiled at ./build/bin/snakeplusplus
-
-Simply run the program using:
-
-    build/bin/snakeplusplus 
-
+# SnakePlusPlus
+A version of Snake made in C++ and using SFML
+
+## Controls
+  - Use the arrow keys to move the Snake
+  - Use the escape key to close the game
+
+## Compiling the game
+
+Prerequisites
+  - C++11
+  - [SFML](https://github.com/SFML/SFML)
+
+Clone the repository and compile it using:
+
+    git clone https://github.com/TriantaTV/snakeplusplus.git
+
+In order to compile the project, simply run these two commands:
+
+    cmake -B build -S .
+    cmake --build build
+
+## Running the Project
+The program should now be compiled at ./build/bin/snakeplusplus
+
+Simply run the program using:
+
+    build/bin/snakeplusplus