first commit
Merge branch 'master' of https://github.com/schavery/thorn

Conflicts:
	res/layout/fragment_camera.xml
	res/layout/fragment_gallery.xml
	src/edu/santarosa/szcgat/thorn/GalleryAndCamera.java

resolve conflicts
Camera working