fixed up git problems(i still dont know how to merge properly :()
Merge branch 'master' of https://github.com/teenHack42/MatrixOS

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