create carousel
Merge branch 'master' of https://github.com/di36ofp/hotel.cat

Conflicts:
	css/main.css
carousel