Blog built
Merge branch 'master' of https://github.com/amparsons/cofactor

Conflicts:
	wp-config.php