added zoom in and out
fixed merge
Merge branch 'master' of https://github.com/tiansjin/GGoggle
fixing stuff
Merge branch 'master' of https://github.com/tiansjin/GGoggle
for andrew :)
Merge remote-tracking branch 'origin/master'