commit new changes - Hieu Vo
Merge branch 'master' of https://github.com/tfx5900/shake

Conflicts:
	wp-content/themes/yeopress/header.php
Merge branch 'master' of https://github.com/tfx5900/shake

Conflicts:
	wp-content/themes/yeopress/header.php
Merge branch 'master' of https://github.com/tfx5900/shake

Conflicts:
	wp-content/themes/yeopress/header.php