use dj-static for static files
merge