cleaned up code
Merge branch 'master' into elf

Conflicts:
	MatrixOS.iso
	bin/MatrixOS.bin
	isodir/MatrixOS.bin
	src/elf_loader.c
	src/elf_loader.o