sd
Merge branch 'master' of https://github.com/zowey/nhw

Conflicts:
	commentStar.php