don't know what I changed in cloudvideo.c
Merge branch 'master' of https://github.com/NeilCBAndrews/CS317Assignment3
merging code