Fixes to apache conf (ServerName)
added tc test
Merge branch 'master' of https://github.com/dtnaylor/bitrate-project-starter
Merge branch 'master' of github.com:fengjingchao/video_cdn