Team Bernhard & holispedia Carousel
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/pages/holispedia.html
	dev/pages/home.html