bighw  6.?
Merge branch 'master' of https://github.com/kylin1993/kylingithub

Conflicts:
	bighw/module.cpp