Merge branch 'master' into klibc
renamed libc.h to klibc.h and updated klibc.c include
updated klibc.h
Merge branch 'libc' of github.com:rellermeyer/course_os into klibc

Conflicts:
	kernel/Makefile
Merge branch 'libc' of github.com:rellermeyer/course_os into libc

Conflicts:
	kernel/Makefile
	kernel/include/klibc.h
copied in good Makefile
temporarily removed Makefiel so I can update branch
readded Makefile
fixup
pulled updated master files
added boot-commands to branch
Merge branch 'klibc' of github.com:rellermeyer/course_os into klibc
minor changes
Fix merge conflict in uart.c
Fix more sloppy merge errors
Merge with klibc