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