merging with master
Merge branch 'master' of https://github.com/jtsanch/music_app
saving recent changes
Added firebase to routes files
Merged to master