carousel homework
Merge pull request #69 from ollyd/master

carousel homework