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

Conflicts:
	self_introduction_B.txt