Edited configs
Merge branch 'master' of https://github.com/Killen1/mtw

Conflicts:
	wp-config-local.php