set for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project 3/src/tcpserver.c
added a make file.