Hixe
Tsuyoi
Harahe
Ramen
hoge
Merge branch 'master' of github.com:hao03/git_dojo

Conflicts:
	txt.txt