Camera changes to prevent crashing (as much)
blah
Merge branch 'master' of https://github.com/hbridge/MotionCamera

Conflicts:
	.idea/misc.xml
	MotionCamera/src/main/java/com/example/motioncamera/MainActivity.java