lab1 finished
!!!
asd
Merge branch 'lab2' of /home/steven/Downloads/JOS into lab2
modify boot_alloc
debuging phase
All exercises done.
Merge branch 'lab2' into lab3

Conflicts:
	kern/monitor.c
All exercise done.
Challenge 1 finished.
Merge branch 'lab3' into lab4

Conflicts:
	kern/trap.c
Exercise 4
Exercise 7
Revert "Exercise 4"

This reverts commit c61893d8bafce9407f8562d2693077c1b0ae11a3.
Revert "Exercise 7"

This reverts commit 7621fb9b5e8dfc16478a6565b8b4dca40ffd6a69.
Exercise 4 again
Lab 4 Done.
slightly changes
All changes done.
Merge branch 'lab4' into lab5

Conflicts:
	kern/env.c
	kern/init.c