wp-config
Merge branch 'master' of https://github.com/madeinspace/id_website

Conflicts:
	wp-config.php
	wp-content/debug.log