Dual stream
Merge branch 'master' of https://github.com/brianrmoore/AutoParts

Conflicts:
	src/Parm.h