Another
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
	functions/page.functions.php
	page/page.switch.php