Merge branch 'master' of https://github.com/sim590/inf1010-tp2

Conflicts:
	src/client.c
	src/server.c