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

Conflicts:
	ClientNetworking/ClientNetworking
	ClientNetworking/instructorController.cpp
	ServerNetworking/ServerNetworking.pro.user