media and transcript partials
Resolved conflicts
Merged all files togethor