Add line parsing to songs
Merge remote-tracking branch 'origin/master'