server now calls appropriate functions
Merge branch 'master' of github.com:brookskindle/tcp-ip-client-server

Conflicts:
	server.c