my local db settings
Merge branch 'master' of https://github.com/RitchieFitz/ldp

Conflicts:
	htdocs/wp-config.php