server testing
Merge branch 'master' of https://github.com/rustinjusso/CS537Project5A

Conflicts:
	SAMPLEIMAGES/test.img
	client.c