aa/other.psdの追加
Merge remote-tracking branch 'origin/color.xml'