still wokring on 3
Merge branch 'master' of https://github.com/hulinghuantest/ColTest

Conflicts:
	33