nothing..
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	Assets/code/Player.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/metadata/4c/4ce14ec42a8865e4d881fc194554771f
	SwarchServer/SwarchServer.v11.suo
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	Assets/Login.unity
	Assets/code/GameProcess.cs
	Assets/code/Player.cs
	Assets/code/Sockets.cs
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/01/01049279b64ae427f91486bbcea77beb
	Library/metadata/02/0215cddee2d284e9c9bda1dbe42f829c
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	Library/metadata/0c/0c2d8569031f5454cbbac2c772e2767d
	Library/metadata/0e/0e7ed4fbd9924480bbb918e339c570e6
	Library/metadata/0f/0fb10c595af974ea6ba0313a749d5c55
	Library/metadata/11/1167c0a28d11119930004d8a4241aa39
	Library/metadata/16/16993237ab83a064f8ad0f0258298796
	Library/metadata/19/199ba61b407d7435aa1a5551f0844272
	Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	Library/metadata/1f/1fc1b71b9dfaf5f4a8ab75efdf9a72d6
	Library/metadata/1f/1fdce4427d10e48a0a07774903b01f73
	Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Library/metadata/24/244c19b648f194fcd8b57d4d66403c4e
	Library/metadata/26/26ebd1f47951f4434892c20bcd5e3861
	Library/metadata/28/28776ef410870442b8d64e6ce9a3d548
	Library/metadata/2c/2c29c08dd1c0b6749b7cd0fcff7a29fd
	Library/metadata/39/3939554270ba34e3c84bf1bc113cf5b7
	Library/metadata/40/400c2f66c145548b6a08e6ac69655ea2
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/44/44b96e31814694584b1c35fec7dc42ea
	Library/metadata/4c/4ce14ec42a8865e4d881fc194554771f
	Library/metadata/4e/4eb73708914564698b03178372f5b8ba
	Library/metadata/53/5317f3e76581f4165b16ede5caa5f14b
	Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Library/metadata/53/535bd66f1f12441f6a3ec2969dfee5ab
	Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Library/metadata/5b/5baab583450424889aad7f3f40e9fba5
	Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	Library/metadata/64/641bb2dce818a8a499b537a1963889ac
	Library/metadata/66/66c8d8b89e1ed4a37bece5045a6aa889
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/69/69680b688d11eb9d30009b3b4241aa39
	Library/metadata/73/73b473491223046b3bccb04fdb29c994
	Library/metadata/74/741cfa51a2f6d4d959a5464ee822a141
	Library/metadata/79/794a3489a6afd4daf80d98a5844341b9
	Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Library/metadata/81/81f90a056484f433badb55a7c96de025
	Library/metadata/83/830b18403dea84783b74345dea9f0606
	Library/metadata/86/8639c51f3dbb24cc8a7f94732f73859d
	Library/metadata/87/879566529466b4acb9d9b47176abe812
	Library/metadata/89/8947ae06ca3df4fcc9786140c1d86f15
	Library/metadata/8b/8b23c9e3952e246c180a8080104ae60b
	Library/metadata/8c/8caa437b19957a045866b84c6218a0db
	Library/metadata/8d/8d25458fdca034e36a127e4b135a0206
	Library/metadata/8d/8d2d948c5443d4b68a74883e055e219b
	Library/metadata/90/902873f1336b14507b2ae690b68ecc51
	Library/metadata/92/92741bd31f6196746a45a0e0bf19154f
	Library/metadata/93/93074eff559734934be9005d139a9ad5
	Library/metadata/96/96571475093fb4359b11d284aff148d9
	Library/metadata/97/9732e64c49e904ff2a10fc7794607fcf
	Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	Library/metadata/99/99d520f65e8a545cf966b5179ed81e2c
	Library/metadata/9a/9abe0941a9bf44931956d406439d7aca
	Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	Library/metadata/9d/9d83e69ef8acb4f20832f9b0610058f3
	Library/metadata/a5/a51e29524d0a242e99bcf94b8a3265ab
	Library/metadata/ab/ab5bb3eb247a4492fa9900f6ac0db050
	Library/metadata/ac/ac56a5cf2102746809f706431073ccee
	Library/metadata/ae/ae87fe833d7664e83a80974a8870690d
	Library/metadata/af/af040a092e2114e9fbd6fab7402e066d
	Library/metadata/af/afebce546543c41b6ba72397a76314e3
	Library/metadata/b2/b25d02d5454ac4210abfe815eb4dbe40
	Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Library/metadata/b8/b8cf65c6c5e4a4d88b7a16e847002999
	Library/metadata/bc/bc909e8e75e9e47b495b8655f87a7922
	Library/metadata/bc/bcf1704da4dcf4ca7be0acf40020b0c4
	Library/metadata/c1/c1259bb9bcb6e481ba03f5d0337633d5
	Library/metadata/c4/c494c890ec8664fd9aa7d66ebfa1a7e6
	Library/metadata/c7/c7823349d54534cd1b3078b6bf95c848
	Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Library/metadata/c8/c83ddef6675f649e8ba048d976753858
	Library/metadata/ca/ca1d9a879c25e42b290503fe320c9347
	Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	Library/metadata/cb/cb1deda9a5ffe44f28e011f5937746ed
	Library/metadata/d5/d51e7d424e4564f9db26e6b4bdd3e9ac
	Library/metadata/da/da8e93600ecdd4feca9cfb553a314e48
	Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	Library/metadata/e1/e14df94c1bd5d475bb0fb92fefa1f00d
	Library/metadata/e1/e1f50dc041f1545edbb228f8daea22a1
	Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Library/metadata/e9/e913213c3756a4392be576ca36eb9b50
	Library/metadata/ef/ef4c125ff680143769b0c8bf1f1bd828
	Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Library/metadata/fe/fed124f80617b40f0917847d5c87ca73
	ProjectSettings/Physics2DSettings.asset
	SwarchServer/SwarchServer.v11.suo
	SwarchServer/SwarchServer/Server.cs
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.exe
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.pdb