code added to main.cs
Merge branch 'master' of https://github.com/putty174/Pong

Conflicts:
	MasterServer/MasterServer/bin/Debug/MasterServer.exe
	Pong.userprefs