delete jplayer
style changes
resolve merge conflict
create happy and sad music views