whew
Merge branch 'master' of https://github.com/Niftykins/os

Conflicts:
	README.md