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
added imagesc to show image at each iteration
merged yin to master
	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
tolerance adjusted
	modified:   MATLAB/alpha/RunSplitBregman_step1solver.m
	modified:   MATLAB/alpha/genSplitBregman_step1solver.m
merge conflict fixed
added more test images
	modified:   MATLAB/alpha/RunSplitBregman_step1solver.m
	modified:   MATLAB/alpha/genSplitBregman_step1solver.m
Merge branch 'master' of https://github.com/simzou/robots

Conflicts:
	MATLAB/alpha/RunSplitBregman_step1solver.m
	modified:   MATLAB/alpha/RunSplitBregman_step1solver.m
fixed merge conflict
Merge branch 'master' of https://github.com/simzou/robots
	modified:   MATLAB/alpha/RunSplitBregman_step1solver.m
	modified:   MATLAB/alpha/genSplitBregman_step1solver.m
Merge branch 'master' of https://github.com/simzou/robots
^2 WPWPWPWPWP`
Run now displays error