added scat
added first line
resolved conflict
finished song
resolved conflict
added song writer names
Merge branch 'dev-toki' into staging
resolved conflict