Side nav changes, and new commit on macbook
Merge branch 'master' of https://github.com/denninginc/SROA

Conflicts:
	page-templates/page-calendar.php
	wp-content/themes/SROA-outfitter/page-templates/page-home-working.php
Committing Pull from Pete