Merge branch 'master' of F:\Projects\postscript-in-jvm with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser/src/main/java/scanner/Interpreter.java
	runtime/src/main/java/runtime/graphics/frame/PSDrawer.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser/target/classes/scanner/Yylex.class
	runtime/target/classes/operators/arithmetic/RandOp.class
	runtime/target/classes/operators/arithmetic/RrandOp.class
	runtime/target/classes/operators/arithmetic/unary/SrandOp.class
	runtime/target/classes/psObjects/PSObject.class
	runtime/target/classes/psObjects/values/composite/PSString.class
	runtime/target/classes/psObjects/values/simple/Operator.class
	runtime/target/classes/psObjects/values/simple/PSMark.class
	runtime/target/classes/psObjects/values/simple/PSName.class
	runtime/target/classes/runtime/Runtime.class
flower, testim, cube added
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser/src/main/java/scanner/Interpreter.java