Added carousel based on cute pics
Merge branch 'master' into notebook

Conflicts:
	.xscreensaver