newfaceu213021 【演習２】
Merge branch 'newface-dev_0605' of https://github.com/newface2013/git-learning.git into newface-dev_0605
Merge branch 'newface-dev_0605' of https://github.com/newface2013/git-learning.git into newface-dev_0605
Merge branch 'newface-dev_0605' of https://github.com/newface2013/git-learning.git into newface-dev_0605
競合解消
Merge branch 'newface-dev_0605' of
https://github.com/newface2013/git-learning.git into newface-dev_0605

Conflicts:
	self_introduction_A.txt