dumb changes
Merge branch 'master' of https://github.com/Rahkeen/CS-3251

Conflicts:
	server
	server.c
Added sendDirectoryInfo and recvDirectoryInfo