Merge pull request #18 from mariansollmann/issue-18

Add song player