Update
Merge branch 'master' of github.com:treerock/emma-duff

Conflicts:
	header.php