.cproject
Merge branch 'master' of https://github.com/una1veritas/Workspace

Conflicts:
	ArduinoLibraries/.cproject
	ArduinoLibraries/.project