Camera works. Stores photos in gallery.

Working on accessing photos from the gallery and placing them into grid
view.
Camera broke again. Attempting to fix.
Fixed Camera.

Accidently removed the declaration of CameraAndPhoto as activity.
Merge branch 'master' into persistentrefactor