Second commit
Merge branch 'master' of https://github.com/kelvinsnijman/playmysong
3rd commit