inserted
inMerge branch 'master' of https://github.com/kareem1234/COMP3004

Conflicts:
	server.cpp