osx old
Merge branch 'master' of https://github.com/luvgaram/network_chatting

Conflicts:
	client
	server
	server.c