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

Conflicts:
	ClientNetworking/ClientNetworking
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/Makefile
	ClientNetworking/controller.o
	ClientNetworking/moc_Client.cpp
	ClientNetworking/moc_controller.cpp
	ClientNetworking/moc_courses.cpp
	ClientNetworking/moc_edittask.cpp
	ClientNetworking/moc_mainwindow.cpp
	ClientNetworking/moc_saveevaluation.cpp
	ClientNetworking/moc_taskcreated.cpp
	ClientNetworking/moc_taskview.cpp
	ClientNetworking/moc_viewta.cpp
	ClientNetworking/moc_viewtasks.cpp
	ClientNetworking/saveevaluation.cpp
	ClientNetworking/saveevaluation.o
	ClientNetworking/ui_courses.h
	ClientNetworking/ui_edittask.h
	ClientNetworking/ui_mainwindow.h
	ClientNetworking/ui_saveevaluation.h
	ClientNetworking/ui_taskcreated.h
	ClientNetworking/ui_taskview.h
	ClientNetworking/ui_viewta.h
	ClientNetworking/ui_viewtasks.h
	ServerNetworking/ServerNetworking.pro.user
	ServerNetworking/moc_Server.cpp
	ServerNetworking/moc_databasecontroller.cpp
	ServerNetworking/moc_databasemanager.cpp
nothing
Merge branch 'master' of https://github.com/kareem1234/COMP3004

Conflicts:
	ClientNetworking/ClientNetworking
	ClientNetworking/ClientNetworking.pro.user
	ClientNetworking/controller.o
	ClientNetworking/moc_Client.cpp
	ClientNetworking/moc_controller.cpp
	ClientNetworking/moc_courses.cpp
	ClientNetworking/moc_edittask.cpp
	ClientNetworking/moc_mainwindow.cpp
	ClientNetworking/moc_saveevaluation.cpp
	ClientNetworking/moc_taskcreated.cpp
	ClientNetworking/moc_taskview.cpp
	ClientNetworking/moc_viewta.cpp
	ClientNetworking/moc_viewtasks.cpp
	ClientNetworking/saveevaluation.o
	ClientNetworking/ui_courses.h
	ClientNetworking/ui_edittask.h
	ClientNetworking/ui_mainwindow.h
	ClientNetworking/ui_saveevaluation.h
	ClientNetworking/ui_taskcreated.h
	ClientNetworking/ui_taskview.h
	ClientNetworking/ui_viewta.h
	ClientNetworking/ui_viewtasks.h
	ServerNetworking/ServerNetworking
	ServerNetworking/ServerNetworking.pro.user
changed viewCourseList message type from VTAS to VCOURSES