fixed merge conflict
admin style
added song player to feed list
admin styles
join genres functionality, and blogs index
gitignore images
deleted images
player