好きな漫画
fix conflict
Merge branch 'master' into Kannyuu
fix conflict

Conflicts:
	PackMen/hoge.txt