Update files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store
	wordpress/wp-content/themes/invert-lite/.DS_Store