Merge branch 'master' of https://github.com/longlc/playground

Conflicts:
	wp-config.php