Carousel changed to html
Merge branch 'master' of https://github.com/Herman90/ExclusiveResorts

Conflicts:
	sources/css/main.css