local first commit
Merge branch 'master' of https://github.com/Codingdojo-Trey/video_test