newfaceu209006 【演習２】競合用
newfaceu209006 競合を解消

Merge branch 'master' of https://github.com/newface2013/git-learning.git

Conflicts:
	self_introduction.txt