Recovered old files and fixed some errors
Recovered old files and fixed some errors 2
Merge branch 'master' of https://github.com/urielsalis/UOS

Conflicts:
	startup

lol