V1
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
	css/main.css.map
	css/sass/_header.scss
	footer.php