Added functionality for taking a picture and then sending it for processing
Merge branch 'Personal'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/HoughTransform/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/HoughTransform/.indexes/e4/e4/c3/9d/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/HoughTransform/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/HoughTransform/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/HoughTransform/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenCV Library - 2.4.8/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenCV Library - 2.4.8/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenCV Library - 2.4.8/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1403031270.index
	.metadata/.plugins/org.eclipse.jdt.core/3874120429.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/HoughTransform/2014/1/4/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/HoughTransform/2014/1/4/refactorings.index
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	HoughTransform/bin/HoughTransform.apk
	HoughTransform/bin/R.txt
	HoughTransform/bin/classes.dex
	HoughTransform/bin/classes/org/opencv/houghtransform/CanvasView.class
	HoughTransform/bin/classes/org/opencv/houghtransform/HoughTransform$1.class
	HoughTransform/bin/classes/org/opencv/houghtransform/HoughTransform.class
	HoughTransform/bin/classes/org/opencv/houghtransform/R$id.class
	HoughTransform/bin/classes/org/opencv/houghtransform/R$layout.class
	HoughTransform/bin/classes/org/opencv/houghtransform/R$string.class
	HoughTransform/bin/classes/org/opencv/houghtransform/R$styleable.class
	HoughTransform/bin/dexedLibs/opencv library - 2.4.8-52a75dfaaefe39b5ef91f857e5e43b47.jar
	HoughTransform/bin/resources.ap_
Added functionality for taking a photo with the phone camera and then sending it for processing