updating carousel with master
finished #13, wiring carousel
merged with carousel