Hello~
Merge remote-tracking branch 'origin/Thomas' into LITTLEsam-

Conflicts:
	Hi.txt