misc
Merge branch 'master' of https://github.com/rweigel/cds301

Conflicts:
	streamlines/vector_basics2.m
	streamlines/vector_basics2.m~