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

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