complete song spec
Merge branch 'kyle_work'