hogehoge
Soroそろ寝たい
Merge branch 'master' of github.com:hao03/git_dojo
Merge branch 'master' into Sunagawa

Conflicts:
	txt.txt
Merge branch 'Sunagawa'