dsadadsa conf
Merge branch 'master' of https://github.com/jiaweiz/test

Conflicts:
	tgclc.txt