add all
Merge branch 'master' of ssh://github.com/yizhengming/test

Conflicts:
	kgpu