Half baked
Merge branch 'master' of github.com:lyair1/Computer-Networking

Conflicts:
	Practical2/Server.c