naive simplifier
Merge remote-tracking branch 'origin/data-structure' into data-structure

Conflicts:
	Simplify.cpp