added carousel
fixed a styling issue for width on the slider
fixed merge conflict with new carousel stuff