Merge remote-tracking branch 'origin/main' into Home_page

# Conflicts:
#	Android/Layout_Version/.gradle/7.5/executionHistory/executionHistory.bin
#	Android/Layout_Version/.gradle/7.5/executionHistory/executionHistory.lock
#	Android/Layout_Version/.gradle/7.5/fileHashes/fileHashes.bin
#	Android/Layout_Version/.gradle/7.5/fileHashes/fileHashes.lock
#	Android/Layout_Version/.gradle/7.5/fileHashes/resourceHashesCache.bin
#	Android/Layout_Version/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	Android/Layout_Version/.gradle/buildOutputCleanup/outputFiles.bin
#	Android/Layout_Version/.gradle/file-system.probe
#	Android/Layout_Version/.idea/workspace.xml
#	Android/Layout_Version/app/build/intermediates/apk/debug/app-debug.apk
#	Android/Layout_Version/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
#	Android/Layout_Version/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
#	Android/Layout_Version/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex
#	Android/Layout_Version/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	Android/Layout_Version/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
#	Android/Layout_Version/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	Android/Layout_Version/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	Android/Layout_Version/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
#	Android/Layout_Version/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
#	Android/Layout_Version/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	Android/Layout_Version/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	Android/Layout_Version/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	Android/Layout_Version/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	Android/Layout_Version/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/MainActivity.class
#	Android/Layout_Version/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+es+419.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h320dp-port-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h360dp-land-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h480dp-land-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h550dp-port-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldrtl-v17.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-small-v4.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v31.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w320dp-land-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w360dp-port-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w480dp-port-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w600dp-land-v13.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	Android/Layout_Version/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
#	Android/Layout_Version/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/MainActivity.dex
#	Android/Layout_Version/app/build/intermediates/runtime_symbol_list/debug/R.txt
#	Android/Layout_Version/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	Android/Layout_Version/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
#	Android/Layout_Version/app/build/outputs/logs/manifest-merger-debug-report.txt
#	Android/Layout_Version/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	Android/Layout_Version/app/src/main/AndroidManifest.xml
#	Android/Layout_Version/app/src/main/java/com/example/layout_version/Account/Account_Page.java
#	Android/Layout_Version/local.properties

Author: fes7713