Missed commits from merge
Added missed code from merge
Fixed some stuff
Fix for feedback given when adding song
Merge
Merge pull request #11 from mgingras/devin-new

Missed commits from merge