Merge branch 'master' into Mario

.gitignore

@@ -1 +1,2 @@
 /.metadata/
+./.metadata/

.metadata/.log

@@ -4199,6 +4199,7 @@ user global configuration and to define the default location to store repositori
 not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+<<<<<<< HEAD
 !SESSION 2022-03-17 13:09:46.356 -----------------------------------------------
 eclipse.buildId=4.21.0.I20210906-0500
 java.version=16.0.1
@@ -4252,3 +4253,5 @@ user global configuration and to define the default location to store repositori
 not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+=======
+>>>>>>> master

.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log

@@ -8,4 +8,7 @@
 2022-03-16 15:14:32,600 [Worker-2: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
 2022-03-16 15:17:56,651 [Worker-4: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
 2022-03-16 15:20:49,837 [Worker-2: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
+<<<<<<< HEAD
 2022-03-17 13:09:55,726 [Worker-2: Loading available Gradle versions] INFO  o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read.
+=======
+>>>>>>> master

.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties

@@ -1,2 +1,6 @@
 #Cached timestamps
+<<<<<<< HEAD
 #Thu Mar 17 13:17:23 CET 2022
+=======
+#Wed Mar 16 15:23:39 CET 2022
+>>>>>>> master

.metadata/version.ini

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 #Thu Mar 17 13:09:51 CET 2022
+=======
+#Wed Mar 16 15:20:45 CET 2022
+>>>>>>> master
 org.eclipse.core.runtime=2
 org.eclipse.platform=4.21.0.v20210906-0500

README.md

@@ -1,5 +1,6 @@
 # Super_Paco_Bros
 Práctica en grupo de Programación del 3º Trimestre de DAM.
+<<<<<<< HEAD
 
 ## Recursos externos utilizados:
 - LWJGL: Lightweight Java Game Library
@@ -8,3 +9,5 @@ Práctica en grupo de Programación del 3º Trimestre de DAM.
 
 ## Documentación:
 [LWJGL](https://javadoc.lwjgl.org")
+=======
+>>>>>>> master