update
Merge branch 'master' of https://github.com/504FinalProjectGroup/ec504-video-encoder.git