debugging statements
vm process, vm kernel, and SwapFile
merge
merge
Merge branch 'master' of https://github.com/iteriani/nachos

Conflicts:
	userprog/UserProcess.java
merge3