d
Merge branch 'master' of https://github.com/kldcty/movepic

Conflicts:
	MovePic.suo
	MovePic/bin/Debug/MovePic.application
	MovePic/bin/Debug/MovePic.exe
	MovePic/bin/Debug/MovePic.exe.manifest
	MovePic/bin/Debug/MovePic.pdb
	MovePic/bin/Debug/MovePic.vshost.application
	MovePic/bin/Debug/MovePic.vshost.exe.manifest
	MovePic/bin/Debug/firebird.log
	MovePic/bin/Release/MovePic.application
	MovePic/bin/Release/MovePic.exe
	MovePic/bin/Release/MovePic.exe.manifest
	MovePic/bin/Release/MovePic.pdb
	MovePic/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MovePic/obj/x86/Debug/MovePic.csproj.FileListAbsolute.txt
	MovePic/obj/x86/Debug/MovePic.exe
	MovePic/obj/x86/Debug/MovePic.pdb
a
Merge branch 'master' of https://github.com/kldcty/movepic

Conflicts:
	MovePic.suo