[fix]test.txt for functionB-1
[fix]test.txt for functionB-2
Merge branch 'functionB'
[fix]functionC-1
[fix]functionC-2
Merge branch 'functionC'
[fix]functionC-3
[fix]functionC-4
Merge branch 'functionC'
[fix]functionD-1
中文測試LOG
中文log測試2
[del]中文檔案
Merge branch 'functionA' of github.com:fenixwu/git-demo into functionA

Conflicts:
	test.txt