new start
Merge branch 'copied_stuff' of https://github.com/cfudge/CMPUT379ASSIGN2 into copied_stuff

Conflicts:
	server_s.c
	server_s.c~