reset
Merge branch 'master' of github.com:Harvey-Specter/hoong

Conflicts:
	note.txt
	ywl_blk1/modules/tshop-um-cates/tshop-um-cates.php