Merge branch 'master' into 'main'

.gitignore

.idea/.gitignore

.idea/.name

.idea/codeStyles/Project.xml

.idea/codeStyles/codeStyleConfig.xml

.idea/compiler.xml

.idea/deploymentTargetSelector.xml

.idea/gradle.xml

.idea/kotlinc.xml

.idea/migrations.xml

.idea/misc.xml

.idea/runConfigurations.xml

.idea/vcs.xml

app/.gitignore

app/build.gradle.kts

app/proguard-rules.pro

...a/com/example/ellegadodepintia/ExampleInstrumentedTest.kt

app/src/main/AndroidManifest.xml

...rc/main/java/com/example/ellegadodepintia/MainActivity.kt

app/src/main/res/drawable/edittext_border.xml