alarm clock working
Merge branch 'master' of https://github.com/joconnor415/PintosProject1

Conflicts:
	.DS_Store