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

Conflicts:
	ClientNetworking/Client.o
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/controller.o
	ClientNetworking/courses.o
	ClientNetworking/edittask.o
	ClientNetworking/instructor.o
	ClientNetworking/main.o
	ClientNetworking/mainwindow.o
	ClientNetworking/saveevaluation.o
	ClientNetworking/ta.o
	ClientNetworking/ui_viewtasks.h
	ServerNetworking/Server.o
	ServerNetworking/ServerNetworking
	ServerNetworking/ServerNetworking.pro.user
	ServerNetworking/moc_Server.cpp
	ServerNetworking/moc_Server.o