Made default carousel height match the map on the visiting page
Merge branch 'master' of https://github.com/egelmex/BCC-website into homePage
Fixed a bug with the carousel for mobiles
Merge branch 'homePage' of https://github.com/graymalkin/BCC-website

Conflicts:
	assets/css/main.css