Added video loading
Merge branch 'master' of https://github.com/matheusamazonas/picg-project2