.gitignore include *~
Meredith changed #define TIMEOUT
Merge branch 'master' of ssh://github.com/matthew-somers/158-C-client-server

Conflicts:
	client
	client-udp.c
	client-udp.c~
	server
	server-udp.c
	server-udp.c~