initial test
Merge branch 'master' of https://github.com/heavenzjq/whyinteraction

Conflicts:
	wp-content/themes/flat-theme/lib/shortcodes.php