Sync changes from Hammer to local
Merge branch 'master' of https://github.com/animekraxe/ucr-pintos