Trying stuff.
Merge branch 'A2a' of https://github.com/Raztor0/OS161 into A2a

Conflicts:
	os161-1.99/kern/proc/proc.c