marrakech in the 20th century