Merge branch 'test_framework' into klibc

Conflicts:
	kernel/Makefile
	kernel/klibc.c
Merge branch 'release' of https://github.com/rellermeyer/course_os into klibc

Conflicts:
	kernel/Makefile
	kernel/klibc.c
Cleaned up klibc.c

Removed excess whitespace
Removed commented print statements