Revert "test commit 2"

This reverts commit 615e997ba5f35232d6b25542464f1e2a15bd50d5.

Conflicts:
	index.php
	wp-config.php