Removed reference to queue.[c/h] from client files
Merge branch 'master' of https://github.com/trewtzu/JAC-RMIT-OSP

Conflicts:
	server/server.c
	shared/util.h