modified:   client.c
	modified:   message.c
	modified:   message.h
	modified:   server.c
	modified:   server.h
Merge branch 'master' of https://github.com/vodaben/CSCI4430A1

Conflicts:
	message.c
	message.h