deleted:    main.c
	typechange: crazyPartyPomelo/web-server/node_modules/.bin/express
Merge branch 'development'
	modified:   README.md
	typechange: crazyPartyPomelo/web-server/node_modules/.bin/express
	modified:   CrazyParty.sln
	modified:   CrazyParty.suo
	modified:   CrazyParty/Bin/Debug/AppManifest.xaml
	modified:   CrazyParty/Bin/Debug/CrazyParty.dll
	modified:   CrazyParty/Bin/Debug/CrazyParty.pdb
	modified:   CrazyParty/Bin/Debug/CrazyParty.xap
	new file:   CrazyParty/Bin/Debug/SimpleJson.dll
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Common.dll
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Common.pdb
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Core.dll
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Core.pdb
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Protocol.dll
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Protocol.pdb
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Proxy.dll
	new file:   CrazyParty/Bin/Debug/SuperSocket.ClientEngine.Proxy.pdb
	new file:   CrazyParty/BinSrc/BinControls/BinDice.cs
	new file:   CrazyParty/BinSrc/BinControls/BinDiceConverter.cs
	new file:   CrazyParty/BinSrc/BinControls/CrazyPartyTile.cs
	new file:   CrazyParty/BinSrc/BinControls/CrazyPartyTileConverter.cs
	modified:   CrazyParty/BinSrc/GlobalVars.cs
	modified:   CrazyParty/BinSrc/Pages/BullsAndCows.xaml
	new file:   CrazyParty/BinSrc/Pages/LocalDicingPage.xaml
	new file:   CrazyParty/BinSrc/Pages/LocalDicingPage.xaml.cs
	modified:   CrazyParty/BinSrc/Pages/SpinBottlePage.xaml
	new file:   CrazyParty/BinSrc/WebHelpers/GameHelper.cs
	new file:   CrazyParty/BinSrc/WebHelpers/UserLoginHelper.cs
	new file:   CrazyParty/BinSrc/WebHelpers/UserProfileHelper.cs
	new file:   CrazyParty/BinSrc/WebHelpers/UserRegisterHelper.cs
	new file:   CrazyParty/BinSrc/WebHelpers/UserRequestResult.cs
	modified:   CrazyParty/CrazyParty.csproj
	modified:   CrazyParty/MainPage.xaml.cs
	new file:   CrazyParty/WebSocket.Silverlight/Extensions.Silverlight.cs
	new file:   CrazyParty/WebSocket.Silverlight/MD5.cs
	new file:   CrazyParty/WebSocket.Silverlight/MD5Managed.cs
	new file:   CrazyParty/WebSocket.Silverlight/WebSocket.Silverlight.cs
	new file:   CrazyParty/WebSocket/Command/BadRequest.cs
	new file:   CrazyParty/WebSocket/Command/Binary.cs
	new file:   CrazyParty/WebSocket/Command/Close.cs
	new file:   CrazyParty/WebSocket/Command/Handshake.cs
	new file:   CrazyParty/WebSocket/Command/Ping.cs
	new file:   CrazyParty/WebSocket/Command/Pong.cs
	new file:   CrazyParty/WebSocket/Command/Text.cs
	new file:   CrazyParty/WebSocket/Command/WebSocketCommandBase.cs
	new file:   CrazyParty/WebSocket/DataReceivedEventArgs.cs
	new file:   CrazyParty/WebSocket/Extensions.cs
	new file:   CrazyParty/WebSocket/MessageReceivedEventArgs.cs
	new file:   CrazyParty/WebSocket/OpCode.cs
	new file:   CrazyParty/WebSocket/Protocol/CloseStatusCodeHybi10.cs
	new file:   CrazyParty/WebSocket/Protocol/CloseStatusCodeRfc6455.cs
	new file:   CrazyParty/WebSocket/Protocol/DraftHybi00DataReader.cs
	new file:   CrazyParty/WebSocket/Protocol/DraftHybi00HandshakeReader.cs
	new file:   CrazyParty/WebSocket/Protocol/DraftHybi00Processor.cs
	new file:   CrazyParty/WebSocket/Protocol/DraftHybi10DataReader.cs
	new file:   CrazyParty/WebSocket/Protocol/DraftHybi10HandshakeReader.cs
	new file:   CrazyParty/WebSocket/Protocol/DraftHybi10Processor.cs
	new file:   CrazyParty/WebSocket/Protocol/FramePartReader/DataFramePartReader.cs
	new file:   CrazyParty/WebSocket/Protocol/FramePartReader/ExtendedLenghtReader.cs
	new file:   CrazyParty/WebSocket/Protocol/FramePartReader/FixPartReader.cs
	new file:   CrazyParty/WebSocket/Protocol/FramePartReader/IDataFramePartReader.cs
	new file:   CrazyParty/WebSocket/Protocol/FramePartReader/MaskKeyReader.cs
	new file:   CrazyParty/WebSocket/Protocol/FramePartReader/PayloadDataReader.cs
	new file:   CrazyParty/WebSocket/Protocol/HandshakeReader.cs
	new file:   CrazyParty/WebSocket/Protocol/ICloseStatusCode.cs
	new file:   CrazyParty/WebSocket/Protocol/IProtocolProcessor.cs
	new file:   CrazyParty/WebSocket/Protocol/ProtocolProcessorBase.cs
	new file:   CrazyParty/WebSocket/Protocol/ProtocolProcessorFactory.cs
	new file:   CrazyParty/WebSocket/Protocol/ReaderBase.cs
	new file:   CrazyParty/WebSocket/Protocol/Rfc6455Processor.cs
	new file:   CrazyParty/WebSocket/Protocol/WebSocketDataFrame.cs
	new file:   CrazyParty/WebSocket/WebSocket.cs
	new file:   CrazyParty/WebSocket/WebSocketCommandInfo.cs
	new file:   CrazyParty/WebSocket/WebSocketState.cs
	new file:   CrazyParty/WebSocket/WebSocketVersion.cs
	modified:   CrazyParty/obj/Debug/BinSrc/Pages/BullsAndCows.g.i.cs
	new file:   CrazyParty/obj/Debug/BinSrc/Pages/LocalDicingPage.g.i.cs
	modified:   CrazyParty/obj/Debug/BinSrc/Pages/SpinBottlePage.g.i.cs
	modified:   CrazyParty/obj/Debug/CrazyParty.csproj.FileListAbsolute.txt
	modified:   CrazyParty/obj/Debug/CrazyParty.dll
	modified:   CrazyParty/obj/Debug/CrazyParty.pdb
	modified:   CrazyParty/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	modified:   CrazyParty/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   CrazyParty/obj/Debug/MainPage.g.cs
	modified:   CrazyParty/obj/Debug/MainPage.g.i.cs
	modified:   CrazyParty/obj/Debug/ResolveAssemblyReference.cache
	modified:   CrazyParty/obj/Debug/XapCacheFile.xml
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/MD22/SimpleJson.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/Net20/SimpleJson.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/Net35/SimpleJson.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/Net40/SimpleJson.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/SL4/SimpleJson.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/SimpleJson.txt
	new file:   WebSocket4Net(0.8).Source/Reference/SimpleJson/WP7/SimpleJson.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Common.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Common.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Core.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Core.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Protocol.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Protocol.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Proxy.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Debug/SuperSocket.ClientEngine.Proxy.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Common.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Common.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Core.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Core.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Protocol.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Protocol.pdb
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Proxy.dll
	new file:   WebSocket4Net(0.8).Source/Reference/SuperSocket.ClientEngine/WP71/Release/SuperSocket.ClientEngine.Proxy.pdb

	deleted:    CrazyParty/BinSrc/CrazyPartyTile.cs
	deleted:    CrazyParty/BinSrc/CrazyPartyTileConverter.cs
	deleted:    CrazyParty/BinSrc/GameWebHelper.cs
	deleted:    CrazyParty/BinSrc/UserLoginHelper.cs
	deleted:    CrazyParty/BinSrc/UserProfileHelper.cs
	deleted:    CrazyParty/BinSrc/UserRegisterHelper.cs
	deleted:    CrazyParty/BinSrc/UserRequestResult.cs
	deleted:    CrazyParty/Toolkit.Content/ApplicationBar.Cancel.png
	deleted:    CrazyParty/Toolkit.Content/ApplicationBar.Check.png
	deleted:    CrazyParty/Toolkit.Content/ApplicationBar.Delete.png
	deleted:    CrazyParty/Toolkit.Content/ApplicationBar.Select.png
Merge branch 'master' of github.com:Rauzice/CrazyParty
game changed.
merge
remove binsurvey and crazyPartyPomelo
add game-web-server
merge origin/development