ugh
Merge branch 'master' of github.com:xCaldazar/VOS-460

Conflicts:
	src/sys/os.cpp