newfaceu213026 競合を解消

Conflicts:
	self_introduction_C.txt
newfaceu213022 【演習１】
newfaceu213022 競合を解消

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

Conflicts:
	self_introduction_C.txt
newfaceu213022 競合を解消

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

Conflicts:
	self_introduction_C.txt
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
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
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
newfaceu213022 【演習１】

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

Conflicts:
	self_introduction_A.txt