upload files done
Delete database.yml
Merge pull request #1 from dderby/master

Ejemplo de convertir a MP4 (H.264+AAC).
Merge pull request #1 from caromero1575/master

Upstream changes