Conflict 1

README.md

@@ -14,6 +14,8 @@ web-based game deployed to GitHub Pages.
 Once deployed, you will be able to access your game at the link in the **About**
 column of the repository's home page.
 
+HOLA!
+
 ## Prerequisites
 
 - [GitHub.com Account](https://github.com)

index.html

@@ -69,7 +69,11 @@ <h1 class="title">2048</h1>
       <div class="tile-container"></div>
     </div>
 
-    <!-- Lab 1: Add Game Rules -->
+    <p class="game-explanation">
+      <strong class="important">How to play:</strong>
+      Use your <strong>arrow keys</strong> to move the tiles. When two tiles with
+      the same number touch, they <strong>merge into one!</strong>
+    </p>
   </div>
 
   <!-- Starts the Game -->

src/game_manager.ts

@@ -16,7 +16,7 @@ export class GameManager {
   /** Game State */
   static state: GameState
   /** Start Tiles Count */
-  static startTiles: number = 1
+  static startTiles: number = 5
 
   constructor(size: number) {
     GameManager.size = size