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

Conflicts:
	src/com/example/snapcam/MainActivity.java