5-15-2014 1745

added music
Merge remote-tracking branch 'upstream/master'
Merge pull request #38 from DevenSmith/master

stevens