config
ignore
working
Merge branch 'master' into dev_server2

Conflicts:
	wp-config.php