new file:   README.md
	modified:   directional_gradient.m
	new file:   directional_gradient.asv
	modified:   directional_gradient.m
Merge branch 'master' of https://github.com/simzou/robots

Conflicts:
	MATLAB/alpha/directional_gradient.m
	deleted:    directional_gradient.asv
	modified:   directional_gradient.m
	modified:   directional_gradient_transpose.m
	modified:   README.md
	modified:   README.md
	modified:   README.md
modified:   README.md
	modified:   README.md
	modified:   README.md
	modified:   README.md
	modified:   README.md
	modified:   README.md
	modified:   README.md
fixed test10.png
merge conflict resolved
Merge branch 'master' of https://github.com/simzou/robots into step0solver
suppressing some outputs, testing different weights