newfaceu213008 【演習２】
newfaceu213008 競合を解消
Merge branch 'master' of https://github.com/newface2013/git-learning.git

Conflicts:
	self_introduction.txt