Merge branch 'master' of

Conflicts:
	wp-content/themes/fancy/style.css