Merge branch 'Synergist-LP-ReDesign' of https://github.com/SynergistBand/Synergist.git into Synergist-LP-ReDesign

Conflicts:
	Synergist.sublime-workspace
	css/styles.css
	inc/nav.html
	index.php
	scss/styles.scss