temp
Merge branch 'master' of https://github.com/KaiminHuang/CSprject2

Conflicts:
	proxy-server/connection.c
	proxy-server/handler.c

Fixed logger