Added a comment using the main eclipse workspace
Merge remote-tracking branch 'origin/master'

Merged the two separately commented files together.

Conflicts:
	testArduino/testArduino.cpp