Edited my old file.
Merge branch 'master' of https://github.com/HainLukas/kiv.os.git

Conflicts:
	SimulaceOS/src/test/JobTesting.java
	SimulaceOS/testData/data02out.txt