newfaceu213028【演習１】
newfaceu213028 【演習１】
Merge https://github.com/newface2013/git-learning

Conflicts:
	self_introduction.txt
Merge https://github.com/newface2013/git-learning
newfaceu213028 【演習１】
newfaceu213028 競合を解消

Merge https://github.com/newface2013/git-learning

Conflicts:
	self_introduction.txt
newface213028 競合を解消

Merge https://github.com/newface2013/git-learning

Conflicts:
	self_introduction.txt
Merge https://github.com/newface2013/git-learning
newfaceu213028 競合解消
Merge https://github.com/newface2013/git-learning
newfaceu213028 競合解消
Merge https://github.com/newface2013/git-learning