So many changes for launch
Final Changes for launch
Merge branch 'full'

Conflicts:
	functions.php
	scss/style.scss