Merge branch 'master' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp

.gitignore

@@ -4,6 +4,8 @@ target/
 !**/src/test/**/target/
 
 ### IntelliJ IDEA ###
+.idea/encodings.xml
+.idea/**
 .idea/modules.xml
 .idea/jarRepositories.xml
 .idea/compiler.xml

.idea/encodings.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file