merge

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'Scheduler2' of https://github.com/Nepetalactone/LightOS into Scheduler2

Conflicts:
	os/main.c
Restored binary.c

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>