Added intent for camera
Added bitmap created with previous image data (used to start camera)
Added bitmap-button (Image_View) for starting the camera
Added text instruction (Text_View) for starting the camera
Added tap text instructions for starting the camera
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/security101/cameraApp/unlock.java
	app/src/main/res/layout/activity_unlock.xml
	app/src/main/res/values/strings.xml
Added intent for camera
Added bitmap created with previous image data (used to start camera)