色�
Merge remote-tracking branch 'origin/master'

Conflicts:
	GTDエディタ/Data.cs
	GTDエディタ/Form1.Designer.cs
	GTDエディタ/Form1.cs