axel
Merge github.com:shmuga/maOS into mark

Conflicts:
	bochslog.txt
asdsd