Temp commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/csc/vindur/optimizer/Optimizer.java
	src/main/java/ru/csc/vindur/optimizer/Plan.java
	src/main/java/ru/csc/vindur/optimizer/TinyOptimizer.java
Fixed optimizer and rewrote class for plan and step.