about to merge with master
Merge branch 'master' of https://github.com/jtsanch/music_app
Merge branch 'master' of https://github.com/jtsanch/music_app
merging with master
merged with master
blah