added zooming and scrolling
Merge branch 'master' of https://github.com/ylwu/HackMIT