Something
Merge branch 'master' of https://github.com/danluna/MusicInMotion
Added attribution
Merged conflict
Merged conflict