adding sidebar styling to main page
Merge branch 'master' into about-us

Conflicts:
	templates/views/layouts/default.hbs
Merge branch 'about-us'
Merge branch 'master' of github.com:MMDC/mdclabs

Conflicts:
	public/styles/site.min.css