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

Conflicts:
	ClientNetworking/Client.o
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/evaluation.cpp
Merge branch 'master' of https://github.com/kareem1234/COMP3004

Conflicts:
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/evaluation.cpp
changes