Added carousel macro

Conflicts:
	README.markdown
	layout/carousel.j2