Merge remote-tracking branch 'upstream/master'
added music and images
Merge pull request #29 from ricklon/master

Music, images