commit for merge
Merge branch 'project2' of github.com:Shavakan/cs341 into project2

Conflicts:
	client.c
server now receives client protocols
Merge branch 'project2' of github.com:Shavakan/cs341 into project2