sophiechang fix
Merge branch 'master' of https://github.com/hanhe333/CS186