clients
hotfix
Merge branch 'master' of https://github.com/zivyuan/gemground

Conflicts:
	gemground.com/header.php
Merge pull request #3 from Solliu/master

clients