bug fix
Merge origin/master

Conflicts:
	final_project/client.c
Merge origin/master

Conflicts:
	final_project/client.c