add
Merge branch 'master' of https://github.com/joconnor415/PintosProject1

Conflicts:
	PintosPeter/src/threads/build/devices/block.o
	PintosPeter/src/threads/build/devices/ide.o
	PintosPeter/src/threads/build/devices/input.o
	PintosPeter/src/threads/build/devices/intq.o
	PintosPeter/src/threads/build/devices/kbd.o
	PintosPeter/src/threads/build/devices/partition.o
	PintosPeter/src/threads/build/devices/pit.o
	PintosPeter/src/threads/build/devices/rtc.o
	PintosPeter/src/threads/build/devices/serial.o
	PintosPeter/src/threads/build/devices/shutdown.o
	PintosPeter/src/threads/build/devices/speaker.o
	PintosPeter/src/threads/build/devices/timer.o
	PintosPeter/src/threads/build/devices/vga.o
	PintosPeter/src/threads/build/kernel.bin
	PintosPeter/src/threads/build/kernel.o
	PintosPeter/src/threads/build/lib/arithmetic.o
	PintosPeter/src/threads/build/lib/debug.o
	PintosPeter/src/threads/build/lib/kernel/bitmap.o
	PintosPeter/src/threads/build/lib/kernel/console.o
	PintosPeter/src/threads/build/lib/kernel/debug.o
	PintosPeter/src/threads/build/lib/kernel/hash.o
	PintosPeter/src/threads/build/lib/kernel/list.o
	PintosPeter/src/threads/build/lib/random.o
	PintosPeter/src/threads/build/lib/stdio.o
	PintosPeter/src/threads/build/lib/stdlib.o
	PintosPeter/src/threads/build/lib/string.o
	PintosPeter/src/threads/build/lib/ustar.o
	PintosPeter/src/threads/build/tests/threads/alarm-multiple.errors
	PintosPeter/src/threads/build/tests/threads/alarm-multiple.output
	PintosPeter/src/threads/build/tests/threads/alarm-multiple.result
	PintosPeter/src/threads/build/tests/threads/alarm-negative.errors
	PintosPeter/src/threads/build/tests/threads/alarm-negative.o
	PintosPeter/src/threads/build/tests/threads/alarm-negative.output
	PintosPeter/src/threads/build/tests/threads/alarm-negative.result
	PintosPeter/src/threads/build/tests/threads/alarm-priority.errors
	PintosPeter/src/threads/build/tests/threads/alarm-priority.o
	PintosPeter/src/threads/build/tests/threads/alarm-priority.output
	PintosPeter/src/threads/build/tests/threads/alarm-priority.result
	PintosPeter/src/threads/build/tests/threads/alarm-simultaneous.errors
	PintosPeter/src/threads/build/tests/threads/alarm-simultaneous.o
	PintosPeter/src/threads/build/tests/threads/alarm-simultaneous.output
	PintosPeter/src/threads/build/tests/threads/alarm-simultaneous.result
	PintosPeter/src/threads/build/tests/threads/alarm-single.output
	PintosPeter/src/threads/build/tests/threads/alarm-single.result
	PintosPeter/src/threads/build/tests/threads/alarm-wait.o
	PintosPeter/src/threads/build/tests/threads/alarm-zero.errors
	PintosPeter/src/threads/build/tests/threads/alarm-zero.o
	PintosPeter/src/threads/build/tests/threads/alarm-zero.output
	PintosPeter/src/threads/build/tests/threads/alarm-zero.result
	PintosPeter/src/threads/build/tests/threads/mlfqs-block.o
	PintosPeter/src/threads/build/tests/threads/mlfqs-fair.o
	PintosPeter/src/threads/build/tests/threads/mlfqs-load-1.o
	PintosPeter/src/threads/build/tests/threads/mlfqs-load-60.o
	PintosPeter/src/threads/build/tests/threads/mlfqs-load-avg.o
	PintosPeter/src/threads/build/tests/threads/mlfqs-recent-1.o
	PintosPeter/src/threads/build/tests/threads/priority-change.errors
	PintosPeter/src/threads/build/tests/threads/priority-change.o
	PintosPeter/src/threads/build/tests/threads/priority-change.output
	PintosPeter/src/threads/build/tests/threads/priority-condvar.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-chain.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-lower.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-multiple.errors
	PintosPeter/src/threads/build/tests/threads/priority-donate-multiple.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-multiple2.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-nest.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-one.errors
	PintosPeter/src/threads/build/tests/threads/priority-donate-one.o
	PintosPeter/src/threads/build/tests/threads/priority-donate-one.output
	PintosPeter/src/threads/build/tests/threads/priority-donate-sema.o
	PintosPeter/src/threads/build/tests/threads/priority-fifo.o
	PintosPeter/src/threads/build/tests/threads/priority-preempt.o
	PintosPeter/src/threads/build/tests/threads/priority-sema.o
	PintosPeter/src/threads/build/tests/threads/tests.o
	PintosPeter/src/threads/build/threads/init.o
	PintosPeter/src/threads/build/threads/interrupt.o
	PintosPeter/src/threads/build/threads/intr-stubs.o
	PintosPeter/src/threads/build/threads/loader.o
	PintosPeter/src/threads/build/threads/malloc.o
	PintosPeter/src/threads/build/threads/mytest.o
	PintosPeter/src/threads/build/threads/palloc.o
	PintosPeter/src/threads/build/threads/start.o
	PintosPeter/src/threads/build/threads/switch.o
	PintosPeter/src/threads/build/threads/synch.o
	PintosPeter/src/threads/build/threads/thread.o