Merge branch 'master' of github.com:yifan-gu/video_cdn into yifan-gu-master

Conflicts:
	handin/src/proxy.c