Begin work on Image
oh well. i changed stuff in the Camera class..
Merge branch 'master' of github.com:GrinnellAppDev/FaceTag-iOS

Conflicts:
	FaceTag/CameraViewController.m