delete
Merge branch 'master' of https://github.com/JulianThijssen/mmapp

Conflicts:
	Android.gitignore
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/nl/uva/multimedia/camera/Application.class
	bin/classes/nl/uva/multimedia/camera/BuildConfig.class
	bin/classes/nl/uva/multimedia/camera/CameraCapture.class
	bin/classes/nl/uva/multimedia/camera/CameraData.class
	bin/classes/nl/uva/multimedia/camera/CameraView$PreviewCallback.class
	bin/classes/nl/uva/multimedia/camera/CameraView$SizeType.class
	bin/classes/nl/uva/multimedia/camera/CameraView.class
	bin/classes/nl/uva/multimedia/camera/CanvasView.class
	bin/classes/nl/uva/multimedia/camera/MyButton.class
	bin/classes/nl/uva/multimedia/camera/MySlider.class
	bin/classes/nl/uva/multimedia/camera/R$attr.class
	bin/classes/nl/uva/multimedia/camera/R$id.class
	bin/classes/nl/uva/multimedia/camera/R$layout.class
	bin/classes/nl/uva/multimedia/camera/R$menu.class
	bin/classes/nl/uva/multimedia/camera/R$string.class
	bin/classes/nl/uva/multimedia/camera/R.class
	gen/nl/uva/multimedia/camera/BuildConfig.java
	gen/nl/uva/multimedia/camera/R.java
	project.properties
	res/layout/main.xml
	res/menu/option_menu.xml
	res/values/strings.xml
	src/nl/uva/multimedia/camera/Application.java
	src/nl/uva/multimedia/camera/CameraCapture.java
	src/nl/uva/multimedia/camera/CameraData.java
	src/nl/uva/multimedia/camera/CameraView.java
	src/nl/uva/multimedia/camera/CanvasView.java
	src/nl/uva/multimedia/camera/MyButton.java
	src/nl/uva/multimedia/camera/MySlider.java