working on the carousel stuff
Merge remote-tracking branch 'origin/master'
more stuff on carousel