modified:   MATLAB/alpha/RunSplitBregman_step1solver.m
	modified:   MATLAB/alpha/genSplitBregman_step1solver.m
Merge branch 'yin' of https://github.com/simzou/robots

Conflicts:
	MATLAB/alpha/RunSplitBregman_step1solver.m
	MATLAB/alpha/genSplitBregman_step1solver.m
	modified:   MATLAB/alpha/RunSplitBregman_step1solver.m
	modified:   MATLAB/alpha/genSplitBregman_step1solver.m
	modified:   MATLAB/alpha/genSplitBregman_step1solver.m
Merge branch 'master' of https://github.com/simzou/robots

Conflicts:
	MATLAB/alpha/RunSplitBregman_step1solver.m
	MATLAB/alpha/genSplitBregman_step1solver.m