scratch
Merge branch 'master' of https://github.com/rostar/rostar.git

Conflicts:
	scratch/CB/independent_fibers/SCM_I_paper_pics.py