updated SongParser functions to match spec
Merge pull request #22 from hogbait/parser_spec

updated SongParser functions to match spec