konflikt
konflikt
Merge branch 'master' of https://github.com/HainLukas/kiv.os.git

Conflicts:
	SimulaceOS/src/shell/Shell.java