Bootstrap custom page
Add title to index
Update to width and height of carousel item
Update to template.css
Merge branch 'master' into gh-pages

Conflicts:
	css/template.css