無視フォルダ指定
Merge branch 'master' into develop