wp-content to be tracked in git
Merge github.com:paulhutch1977/PattyTalbert

Conflicts:
	index.php