new file:   readme.txt
	new file:   Pigeon.sln
	new file:   Pigeon/App.xaml
	new file:   Pigeon/App.xaml.cs
	new file:   Pigeon/Assets/AlignmentGrid.png
	new file:   Pigeon/Assets/ApplicationIcon.png
	new file:   Pigeon/Assets/Tiles/FlipCycleTileLarge.png
	new file:   Pigeon/Assets/Tiles/FlipCycleTileMedium.png
	new file:   Pigeon/Assets/Tiles/FlipCycleTileSmall.png
	new file:   Pigeon/Assets/Tiles/IconicTileMediumLarge.png
	new file:   Pigeon/Assets/Tiles/IconicTileSmall.png
	new file:   Pigeon/Bin/Debug/AppManifest.xaml
	new file:   Pigeon/Bin/Debug/Assets/ApplicationIcon.png
	new file:   Pigeon/Bin/Debug/Assets/Tiles/FlipCycleTileLarge.png
	new file:   Pigeon/Bin/Debug/Assets/Tiles/FlipCycleTileMedium.png
	new file:   Pigeon/Bin/Debug/Assets/Tiles/FlipCycleTileSmall.png
	new file:   Pigeon/Bin/Debug/Assets/Tiles/IconicTileMediumLarge.png
	new file:   Pigeon/Bin/Debug/Assets/Tiles/IconicTileSmall.png
	new file:   Pigeon/Bin/Debug/MDIL/MatriX.dll
	new file:   Pigeon/Bin/Debug/MDIL/Pigeon.dll
	new file:   Pigeon/Bin/Debug/MDIL/WMAppManifest.xml
	new file:   Pigeon/Bin/Debug/MatriX.dll
	new file:   Pigeon/Bin/Debug/Pigeon.dll
	new file:   Pigeon/Bin/Debug/Pigeon.pdb
	new file:   Pigeon/Bin/Debug/Pigeon_Debug_AnyCPU.xap
	new file:   Pigeon/Bin/Debug/Properties/WMAppManifest.xml
	new file:   Pigeon/External/MatriX.dll
	new file:   Pigeon/LocalizedStrings.cs
	new file:   Pigeon/MainPage.xaml
	new file:   Pigeon/MainPage.xaml.cs
	new file:   Pigeon/Msg/MessageHandler.cs
	new file:   Pigeon/Msg/MessageUtility.cs
	new file:   Pigeon/Msg/Msgtools.cs
	new file:   Pigeon/Pigeon.csproj
	new file:   Pigeon/Pigeon.csproj.user
	new file:   Pigeon/Properties/AppManifest.xml
	new file:   Pigeon/Properties/AssemblyInfo.cs
	new file:   Pigeon/Properties/WMAppManifest.xml
	new file:   Pigeon/Resources/AppResources.Designer.cs
	new file:   Pigeon/Resources/AppResources.resx
	new file:   Pigeon/obj/Debug/App.g.cs
	new file:   Pigeon/obj/Debug/App.g.i.cs
	new file:   Pigeon/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	new file:   Pigeon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	new file:   Pigeon/obj/Debug/MDIL/MDILFileList.xml
	new file:   Pigeon/obj/Debug/MDIL/MDILXapCompileLog.txt
	new file:   Pigeon/obj/Debug/MDIL/MatriX.dll
	new file:   Pigeon/obj/Debug/MDIL/Pigeon.dll
	new file:   Pigeon/obj/Debug/MDILCacheFile.xml
	new file:   Pigeon/obj/Debug/MainPage.g.cs
	new file:   Pigeon/obj/Debug/MainPage.g.i.cs
	new file:   Pigeon/obj/Debug/Pigeon.Resources.AppResources.resources
	new file:   Pigeon/obj/Debug/Pigeon.csproj.FileListAbsolute.txt
	new file:   Pigeon/obj/Debug/Pigeon.csproj.GenerateResource.Cache
	new file:   Pigeon/obj/Debug/Pigeon.csprojResolveAssemblyReference.cache
	new file:   Pigeon/obj/Debug/Pigeon.dll
	new file:   Pigeon/obj/Debug/Pigeon.g.resources
	new file:   Pigeon/obj/Debug/Pigeon.pdb
	new file:   Pigeon/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
	new file:   Pigeon/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
	new file:   Pigeon/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
	new file:   Pigeon/obj/Debug/XapCacheFile.xml
	new file:   hehe.txt
	modified:   readme.txt
test for hehe
readme.txt
create branch
Merge branch 'developer' into yuhui7red

Conflicts:
	Pigeon

	new file:   Pigeon.sln
	new file:   Pigeon.suo#
	new file:   Pigeon.v11.suo
	new file:   hehe.txt
	new file:   readme.txt