author change
Merge branch 'master' of https://github.com/YagerGuo/ShineJava

Conflicts:
	wp-content/themes/discover/style.css