view video and music, create django admin and register models
Problem
Resolve merge