corrigindo problemas de vídeo
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia
_alterações
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia

Conflicts:
	js/custom.js