Edits from today
Hoping this merged the remaining files.

Conflicts:
	footer.php
	single.php
	style.css