working on carousel
Merge branch 'master' of github.com:davidgbe/scheduler