わからない変更
Merge remote-tracking branch 'origin/master'

Conflicts:
	WindowsFormsApplication2.v12.suo

	WindowsFormsApplication2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	WindowsFormsApplication2/obj/Debug/WindowsFormsApplication2.csproj.FileListAbsolute.txt