Zooms in correctly
merging
Merge branch 'master' of https://github.com/gestone/WaterFountain

Conflicts:
	app/src/main/java/hack/com/waterfountain/MainActivity.java