some stuff
Merge branch 'master' of https://github.com/suhongjin94/eecs332