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

Conflicts:
	ClientNetworking/ClientNetworking
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/InstructorController.h
	ServerNetworking/ServerNetworking.pro.user