arreglos de carpetas de trailer/video
Merge branch 'master' of github.com:Wargo/reddevil

Conflicts:
	.gitignore
	Config/core.php