MINE!!!
Eureka!
several half done problems
Merge remote-tracking branch 'origin/master'

Conflicts:
	pipeline.cpp