Quick class pull request
Merge pull request #21 from ostlerc/class2

Quick class pull request
Merge remote-tracking branch 'upstream/master' into mergeblocks

Conflicts:
	Optimizations/Optimizer.cpp
Merge branch 'mergeblocks' into dev