listen
Merge pull request #1 from yifan-gu/master

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

Conflicts:
	handin/src/proxy.c
finish select
add client and server prototype
Added mydns header
finish get and parse bunny
add client and server
Merge branch 'master' of https://github.com/dtnaylor/bitrate-project-starter
finish client parsing
finish get bitrate
push before merge
finish bitrate calculation