Updated stuff
Merge branch 'master' of https://github.com/zaynashahzad24/CS158A

Conflicts:
	Project 2/TCP-Program/tcpserver.c