solv conflict
Merge branch 'master' of https://github.com/shijingwang/matrix.git

Conflicts:
	rule.txt