local
Merge branch 'a_pj2' of github.com:ccelest/pintos into a_pj2

Conflicts:
	src/userprog/process.c
local2