changes
changes
Merge branch 'master' of https://github.com/kareem1234/COMP3004

Conflicts:
	ClientNetworking/ClientNetworking
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/Makefile
	ClientNetworking/tamainscreen.ui
	ServerNetworking/Makefile
	ServerNetworking/ServerNetworking.pro.user