commit
Merge branch 'alarmclock' of https://github.com/tylervanover/pintos into alarmclock
There's new stuff to pull down. I must merge!
Merge branch 'alarmclock' of https://github.com/tylervanover/pintos into alarmclock
work on lock_acquire() and donations
added new condition blocks to lock_acquire(), should let us donate priorities, yet still is not working
Merge branch 'donation' of https://github.com/tylervanover/pintos into donation
Merge branch 'donation' of https://github.com/tylervanover/pintos into donation

commit
fixed some issues, caused more
fixed other things (priority-sema, priority-fifo), but broke others (priority-donate-one)