Carousel added
Merge branch 'master' of https://github.com/rnosov/infovite

Conflicts:
	app/_layout.jade