u213038 【演習１】
Merge branch 'newface-dev_0605' of https://github.com/newface2013/git-learning into newface-dev_0605
Merge branch 'newface-dev_0605' of https://github.com/newface2013/git-learning into newface-dev_0605

Conflicts:
	self_introduction_A.txt
Merge branch 'newface-dev_0605' of https://github.com/newface2013/git-learning into newface-dev_0605
u213038 競合を解消