Merge branches 'master' and 'alarmclock'
Merge branch 'donation' of git://github.com/tylervanover/pintos into donation
test commit, not sure if repo is established properly on local machine