Merge branch 'master' of https://github.com/putty174/Pong

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Scripts/Client.cs
	Assets/Scripts/GameProcess.cs
	Assets/Scripts/Player1.cs
	LatestPong.app/Contents/Data/Managed/Assembly-CSharp.dll
	LatestPong.app/Contents/Data/Managed/Assembly-UnityScript.dll
	LatestPong.app/Contents/Data/PlayerConnectionConfigFile
	LatestPong.app/Contents/Data/mainData
	LatestPong.app/Contents/Data/sharedassets0.assets
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/metadata/08/08d8285cd8788465e96b112ec88e592f
	Library/metadata/0b/0be4f38d7272e4517aae1f6941e22043
	Library/metadata/13/133222854b9184b059f00a90529c6fc6
	Library/metadata/2c/2ca85a524db2e45119893605b9fff4ba
	Library/metadata/83/8324f70301aad475f8604cb322a55d91
	Library/metadata/85/858dfc3cadb9da045a1b9610cba835d2
	Library/metadata/ad/adebc56ab0afa4214bc6c50dfd988b55
	Library/metadata/c3/c30db2ecd70f44069b0160cb79302830
	Library/metadata/ca/ca66bb0ea92a643d384bbba7a45c5c7e
	Library/metadata/e4/e46a99033806fb3418f6b8d341f3c82c
	MasterServer/MasterServer.userprefs
	MasterServer/MasterServer/Main.cs
	MasterServer/MasterServer/bin/Debug/MasterServer.exe
	MasterServer/MasterServer/bin/Debug/MasterServer.exe.mdb
	Pong-csharp.sln
	Pong.sln
	Pong.userprefs
Merge branch 'master' of https://github.com/putty174/Pong

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/metadata/02/020a3cfd64cde47bbad5b9f54af88a37
	Library/metadata/08/08d8285cd8788465e96b112ec88e592f
	Library/metadata/83/8324f70301aad475f8604cb322a55d91
	MasterServer/MasterServer/bin/Debug/MasterServer.exe
	Pong-csharp.sln
	Pong.sln
	Pong.userprefs