forked from mrlan/EnglishPal
				
			Merge remote-tracking branch 'origin/SPM2023S-QianJunQi' into SPM2023S-QianJunQi
# Conflicts: # app/wordCMD.pySPM2023S-QianJunQi
						commit
						0ed7657747
					
				# Conflicts: # app/wordCMD.pySPM2023S-QianJunQi