commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php
	style.css