proc.c works!
Merge branch 'master' of https://github.com/rustinjusso/CS537Project4B

Conflicts:
	xv6/kernel/proc.c