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

Conflicts:
	self_introduction_B.txt