Mo' bettuh, but still no joy
Merge branch 'master' of https://github.com/ppinter1/AndroidCamera

Conflicts:
	src/com/sample/camera/MainActivity.java
Add some more Log messages