Added song chords
Tests fixed
Merge pull request #1 from maratis/master

JIRA-1234