Alarm working
Cleanup
Merge branch 'master' into priority_Scheduler

Conflicts:
	pintos/src/threads/thread.c