first commit to my branch
merging
Working on music player
music player doneish