Printstream uppdaterad
Merge remote-tracking branch 'origin/master'

Conflicts:
	XL/src/gui/menu/XLPrintStream.java
	XL/src/model/CircularErrorSlot.java
	XL/src/model/Slot.java