sdjfbhdgjjerg
'Fixing .metadata folder'
Merge branch 'master' of https://github.com/ionambrinoc/raspberry

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/7a/a044b33293860012141ca0cf179e65a5
	.metadata/.plugins/org.eclipse.core.resources/.history/83/a06a9214a2860012141ca0cf179e65a5
	.metadata/.plugins/org.eclipse.core.resources/.history/9/407ddf56a1860012141ca0cf179e65a5
	.metadata/.plugins/org.eclipse.core.resources/.history/c5/b080ad2893860012141ca0cf179e65a5
	.metadata/.plugins/org.eclipse.core.resources/.history/df/50b6be3293860012141ca0cf179e65a5
	.metadata/.plugins/org.eclipse.core.resources/.projects/Controller/.indexes/e4/9c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Controller/.indexes/e4/c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Controller/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Controller/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/9.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.jdt.core/2663827393.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/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.jdt.ui/jdt-images/6.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/9.png
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml