work on dropdown menu
added media player
merge conflicts resolved
merge conflicts resolved
adding song files
Merge branch 'master' of https://github.com/nyhunter77/emotions
migrated admin