Merge pull request #2 from ProgSysAv/master

sdm - master conflict resolution
Cosmetic changes on Makefiles
Signed-off-by: 399man <399man@gmail.com>
Cosmetic changes on bootloader/Makefile and bootloader/bootloader.asm
First C part + Updated Makefiles
Merge remote-tracking branch 'origin/sdm' into mox