ignore the wp-config.php
Merge branch 'master' of https://github.com/YagerGuo/ShineJava

Conflicts:
	wp-config.php
Merge branch 'master' of https://github.com/YagerGuo/ShineJava
the code block