My Version of a OS
Merge branch 'master' of https://github.com/ethansattler/E-OS

Conflicts:
	link.ld~