working on zoom bug
Merge branch 'master' of https://github.com/cheunjm/cs171-project-jcheun-rkim
Merge branch 'master' of https://github.com/cheunjm/cs171-project-jcheun-rkim