thursday changes
Merge branch 'master' of https://github.com/juandejoya/cs162projs

Conflicts:
	nachos/userprog/UserProcess.java