Merge branch 'master' of /Users/tessandrasage/Desktop/NachosProject with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	nachos/threads/KThread.java
	out/production/Nachos Project/nachos/threads/KThread$PingTest.class
	out/production/Nachos Project/nachos/threads/KThread.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	out/production/Nachos Project/nachos/threads/KThread$1.class
	out/production/Nachos Project/nachos/threads/KThread$2.class
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
commenting out the print function