Folk music includes both traditional music and the genre that evolved from it during the 20th century folk revival.