only alter links for layout templates
add template for individual pages with left nav
Merge branch 'master' of https://github.com/mintcanary/wpbsone

* 'master' of https://github.com/mintcanary/wpbsone:
  add template for individual pages with left nav
  only alter links for layout templates

Conflicts:
	style.css
switch default template to left nav
left nav max width
font
Merge branch 'master' of https://github.com/mintcanary/wpbsone

* 'master' of https://github.com/mintcanary/wpbsone:
  left nav max width

Conflicts:
	style.css
video wrapper
change sidebar widths depending on which are active
Merge branch 'master' of https://github.com/mintcanary/wpbsone

* 'master' of https://github.com/mintcanary/wpbsone:
  change sidebar widths depending on which are active

Conflicts:
	page-individual-left-nav.php
	page.php
change sidebar widths depending on which are active
colours