This was a test.
Test number 2.
Test #3
Merge branch 'master' of https://github.com/NigoroJr/CSE381 into NigoroJr-master

Conflicts:
	README.md
Added all the changes after struggling with installations. No testing yet done on user programs. Hopefully Naoki can test it.
Merge branch 'master' of github.com:proctopj/cse381 into merge

Conflicts:
	src/userprog/exception.c
	src/userprog/process.c
	src/userprog/syscall.c
	src/userprog/syscall.h

This merge resolves conflicts between proctopj/cse381 and NigoroJr/cse381.
However, the only difference is the newline characters and the code itself is
not changed.