hoge
rebase_test
newfaceu213018
newfaceu213027 【リベースの練習】
newfaceu213018 競合を解消
rebaseの準備
rebaseの準備　小森
rebase no junnbi
kakakakakakakaka
koygou
up
rebase
test
test
Merge branch 'teamB_2' of https://github.com/newface2013/git-learning into teamB_2

Conflicts:
	self_introduction_D.txt