commiting proc.c
Message goes here
i# and have 1 and 12 different commits each, respectively.
test
 Merge branch 'master' of https://github.com/regehr/advanced_os_class

Conflicts:
	john/_cat
	john/_echo
	john/_forktest
	john/_grep
	john/_init
	john/_kill
	john/_ln
	john/_ls
	john/_mkdir
	john/_rm
	john/_sh
	john/_stressfs
	john/_usertests
	john/_wc
	john/_zombie
	john/bio.o
	john/cat.asm
	john/cat.sym
	john/console.o
	john/echo.asm
	john/echo.sym
	john/exec.o
	john/file.o
	john/forktest.asm
	john/fs.img
	john/fs.o
	john/grep.asm
	john/grep.sym
	john/ide.o
	john/init.asm
	john/init.sym
	john/kalloc.o
	john/kernel
	john/kernel.asm
	john/kernel.sym
	john/kill.asm
	john/kill.sym
	john/ln.asm
	john/ln.sym
	john/ls.asm
	john/ls.sym
	john/mkdir.asm
	john/mkdir.sym
	john/rm.asm
	john/rm.sym
	john/sh.asm
	john/sh.sym
	john/stressfs.asm
	john/stressfs.sym
	john/uart.o
	john/usertests.asm
	john/usertests.sym
	john/wc.asm
	john/wc.sym
	john/xv6.img
	john/zombie.asm
	john/zombie.sym
test file