phase 1
Merge pull request #2 from delasky/songify

phase 1