safety commit
Merge branch 'master' of https://github.com/izhang1/cs252lab6
Fixed merge changes