proj2 final
proj2 final
Merge branch 'master' of https://github.com/whyao/cse120

Conflicts:
	proj2/nachos/ag/AutoGrader.class
	proj2/nachos/ag/BoatGrader.class
	proj2/nachos/machine/ArrayFile.class
	proj2/nachos/machine/AssertionFailureError.class
	proj2/nachos/machine/Coff.class
	proj2/nachos/machine/CoffSection.class
	proj2/nachos/machine/Config.class
	proj2/nachos/machine/ElevatorBank$1.class
	proj2/nachos/machine/ElevatorBank$ElevatorManager$1.class
	proj2/nachos/machine/ElevatorBank$ElevatorManager.class
	proj2/nachos/machine/ElevatorBank$ElevatorState.class
	proj2/nachos/machine/ElevatorBank$RiderState$1.class
	proj2/nachos/machine/ElevatorBank$RiderState.class
	proj2/nachos/machine/ElevatorBank.class
	proj2/nachos/machine/ElevatorControllerInterface.class
	proj2/nachos/machine/ElevatorControls.class
	proj2/nachos/machine/ElevatorEvent.class
	proj2/nachos/machine/ElevatorGui$ElevatorShaft.class
	proj2/nachos/machine/ElevatorGui$Floor.class
	proj2/nachos/machine/ElevatorGui.class
	proj2/nachos/machine/ElevatorTest$1.class
	proj2/nachos/machine/ElevatorTest$ElevatorController$1.class
	proj2/nachos/machine/ElevatorTest$ElevatorController.class
	proj2/nachos/machine/ElevatorTest$Rider$1.class
	proj2/nachos/machine/ElevatorTest$Rider.class
	proj2/nachos/machine/ElevatorTest.class
	proj2/nachos/machine/FileSystem.class
	proj2/nachos/machine/Interrupt$1.class
	proj2/nachos/machine/Interrupt$InterruptPrivilege.class
	proj2/nachos/machine/Interrupt$PendingInterrupt.class
	proj2/nachos/machine/Interrupt.class
	proj2/nachos/machine/Lib.class
	proj2/nachos/machine/Machine$1.class
	proj2/nachos/machine/Machine$MachinePrivilege.class
	proj2/nachos/machine/Machine.class
	proj2/nachos/machine/MalformedPacketException.class
	proj2/nachos/machine/NetworkLink$1.class
	proj2/nachos/machine/NetworkLink$2.class
	proj2/nachos/machine/NetworkLink$3.class
	proj2/nachos/machine/NetworkLink$4.class
	proj2/nachos/machine/NetworkLink.class
	proj2/nachos/machine/OpenFile.class
	proj2/nachos/machine/OpenFileWithPosition.class
	proj2/nachos/machine/Packet.class
	proj2/nachos/machine/Processor$1.class
	proj2/nachos/machine/Processor$Instruction.class
	proj2/nachos/machine/Processor$Mips.class
	proj2/nachos/machine/Processor$MipsException.class
	proj2/nachos/machine/Processor$ProcessorPrivilege.class
	proj2/nachos/machine/Processor.class
	proj2/nachos/machine/RiderControls.class
	proj2/nachos/machine/RiderEvent.class
	proj2/nachos/machine/RiderInterface.class
	proj2/nachos/machine/SerialConsole.class
	proj2/nachos/machine/StandardConsole$1.class
	proj2/nachos/machine/StandardConsole$2.class
	proj2/nachos/machine/StandardConsole.class
	proj2/nachos/machine/Stats.class
	proj2/nachos/machine/StubFileSystem$FileRemover.class
	proj2/nachos/machine/StubFileSystem$StubOpenFile$1.class
	proj2/nachos/machine/StubFileSystem$StubOpenFile.class
	proj2/nachos/machine/StubFileSystem.class
	proj2/nachos/machine/TCB$1.class
	proj2/nachos/machine/TCB$2.class
	proj2/nachos/machine/TCB$TCBPrivilege.class
	proj2/nachos/machine/TCB.class
	proj2/nachos/machine/Timer$1.class
	proj2/nachos/machine/Timer$2.class
	proj2/nachos/machine/Timer.class
	proj2/nachos/machine/TranslationEntry.class
	proj2/nachos/security/NachosSecurityManager$1.class
	proj2/nachos/security/NachosSecurityManager$2.class
	proj2/nachos/security/NachosSecurityManager$PrivilegeProvider.class
	proj2/nachos/security/NachosSecurityManager.class
	proj2/nachos/security/Privilege$InterruptPrivilege.class
	proj2/nachos/security/Privilege$MachinePrivilege.class
	proj2/nachos/security/Privilege$ProcessorPrivilege.class
	proj2/nachos/security/Privilege$TCBPrivilege.class
	proj2/nachos/security/Privilege.class
	proj2/nachos/threads/Alarm$1.class
	proj2/nachos/threads/Alarm.class
	proj2/nachos/threads/Boat$1.class
	proj2/nachos/threads/Boat.class
	proj2/nachos/threads/Communicator.class
	proj2/nachos/threads/Condition.class
	proj2/nachos/threads/Condition2.class
	proj2/nachos/threads/ElevatorController.class
	proj2/nachos/threads/Lock.class
	proj2/nachos/threads/LotteryScheduler.class
	proj2/nachos/threads/PriorityScheduler$PriorityQueue.class
	proj2/nachos/threads/PriorityScheduler$ThreadState.class
	proj2/nachos/threads/PriorityScheduler.class
	proj2/nachos/threads/Rider.class
	proj2/nachos/threads/RoundRobinScheduler$1.class
	proj2/nachos/threads/RoundRobinScheduler$FifoQueue.class
	proj2/nachos/threads/RoundRobinScheduler.class
	proj2/nachos/threads/Scheduler.class
	proj2/nachos/threads/Semaphore$PingTest.class
	proj2/nachos/threads/Semaphore.class
	proj2/nachos/threads/SynchList$PingTest.class
	proj2/nachos/threads/SynchList.class
	proj2/nachos/threads/ThreadQueue.class
	proj2/nachos/userprog/SynchConsole$1.class
	proj2/nachos/userprog/SynchConsole$2.class
	proj2/nachos/userprog/SynchConsole$File.class
	proj2/nachos/userprog/SynchConsole.class
	proj2/nachos/userprog/UserKernel.class
	proj2/nachos/userprog/UserProcess.class
	userprog/.UserKernel.java.swp
	userprog/.UserProcess.java.swp
	userprog/UserKernel.java
	userprog/UserProcess.java