Merge branch 'master' into 'main'

.gradle/5.4.1/fileChanges/last-build.bin

.gradle/5.4.1/fileHashes/fileHashes.lock

.gradle/5.4.1/gc.properties

.gradle/7.3.1/checksums/checksums.lock

.../7.3.1/dependencies-accessors/dependencies-accessors.lock

.gradle/7.3.1/dependencies-accessors/gc.properties

.gradle/7.3.1/fileChanges/last-build.bin

.gradle/7.3.1/fileHashes/fileHashes.lock

.gradle/7.3.1/gc.properties

.gradle/buildOutputCleanup/buildOutputCleanup.lock

.gradle/buildOutputCleanup/cache.properties

.gradle/vcs-1/gc.properties

build.gradle

gradle/wrapper/gradle-wrapper.jar

gradle/wrapper/gradle-wrapper.properties

gradlew

gradlew.bat

src/com/uca/StartServer.java

src/com/uca/core/UserCore.java

src/com/uca/dao/UserDAO.java