yeah
Merge branch 'master' of https://github.com/vodaben/CSCI4430A1.git

Conflicts:
	client.c
	makefile
	message.c
	message.h
	server.c
	server.h