newfaceu209006 競合解決の練習
newfaceu209006 競合を解消

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

Conflicts:
	self_introduction.txt