Example custom bootstrap page
Update to template.css
Merge branch 'master' into gh-pages

Conflicts:
	css/template.css
Fix to merge conflicts
update to carousel image width
Adding a readme file
Updating master with latest code changes

Merge branch 'gh-pages'