dfgsd
dfg
Merge branch 'master' of https://github.com/paulv888/Arduino

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.cdt.ui/Coop.build.log
	.metadata/.plugins/org.eclipse.cdt.ui/Ethernet.build.log
	.metadata/.plugins/org.eclipse.cdt.ui/Mine_ATmega328__3_3V_Ext_8_MHz.build.log
	.metadata/.plugins/org.eclipse.cdt.ui/global-build.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARDBrigde/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/ARDBrigde/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Arduino_Uno/.indexes/19/d8/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Arduino_Uno/.indexes/19/d8/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Arduino_Uno/.indexes/19/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Arduino_Uno/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.indexes/19/8c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.indexes/19/91/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.indexes/19/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.indexes/af/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Coop/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Ethernet/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Ethernet/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Mine_ATmega328__3_3V_Ext_8_MHz/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Range/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/SPI/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/SharedFiles/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/it.baeyens.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	SharedFiles/share_commands.h
some stuff wokring