.
.
Merge branch 'master' of https://github.com/vincentwhwoo/SnapCam.git

Conflicts:
	bin/SnapCam.apk
	bin/classes.dex
	bin/classes/com/example/snapcam/MainActivity.class
	bin/resources.ap_
	src/com/example/snapcam/MainActivity.java