Lab 4, Exercise 12
Lab 4, Exercise 13
Merge branch 'lab4' of https://github.com/yanzhe-chen/jos-2013 into lab4

Conflicts:
	kern/trap.c
	kern/trapentry.S