1
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Programming\postscript-in-jvm\postscript-in-jvm with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	1_rectangles.ps
	parser/src/main/java/scanner/Interpreter.java
	runtime/src/main/java/operators/pathConstruction/ArcOp.java
Merge remote-tracking branch 'origin/master'
Sharing to strings.
CopyOp added.
Merge remote-tracking branch 'origin/master'

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