Remove P1 delay?
Remove pt2
Merge branch 'master' of https://github.com/putty174/Pong

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/02/020a3cfd64cde47bbad5b9f54af88a37
	Library/metadata/83/8324f70301aad475f8604cb322a55d91
	MasterServer/MasterServer/bin/Debug/MasterServer.exe
	MasterServer/MasterServer/bin/Release/MasterServer.exe
	Pong-csharp.sln
	Pong.sln
	Pong.userprefs