Revert "Revert "Merge branch 'master'""

This reverts commit 1bf3100c06bddb68fc739c726661a1d040d823a8.
Shizzle gefixt
Merge branch 'master' of https://github.com/JSF31-S33-JE/JSF31-S33-JE

Conflicts:
	OS_process/nbproject/project.properties
	OS_process/src/runtime/OS_output.java