Rewirted
Merge branch 'master' of https://github.com/urielsalis/UOS

Conflicts:
	PartManager
	UOS/os
	startup

Rewrite 1