Combining client/server
Merge branch 'master' of https://github.com/AhmedGad/Networks_Assignment_2

Conflicts:
	UDP_client/UDP_client.cpp