Merge branch 'main' of /Users/danielduran/cs346 with conflicts.

.gradle/7.3.3/checksums/checksums.lock

.../7.3.3/dependencies-accessors/dependencies-accessors.lock

.gradle/7.3.3/executionHistory/executionHistory.bin

.gradle/7.3.3/executionHistory/executionHistory.lock

.gradle/7.3.3/fileHashes/fileHashes.bin

.gradle/7.3.3/fileHashes/fileHashes.lock

.gradle/7.3.3/fileHashes/resourceHashesCache.bin

.gradle/buildOutputCleanup/buildOutputCleanup.lock

.gradle/buildOutputCleanup/outputFiles.bin

.gradle/file-system.probe

.idea/kotlinc.xml

...ld/classes/kotlin/main/META-INF/application.kotlin_module

application/build/classes/kotlin/main/module-info.class

...ld/classes/kotlin/main/net/codebot/application/Main.class

...n/build/classes/merged/META-INF/application.kotlin_module

application/build/classes/merged/module-info.class

...n/build/classes/merged/net/codebot/application/Main.class

application/build/kotlin/application100jar-classes.txt

...leKotlin/cacheable/caches-jvm/inputs/source-to-output.tab

...acheable/caches-jvm/inputs/source-to-output.tab.keystream