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

Merge branch 'newface-dev_0605' of
https://github.com/newface2013/git-learning.git into newface-dev_0605

Conflicts:
	self_introduction_A.txt
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